From 8488f7be1fa4912e5b92369c5562eb512a0553dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 27 May 2024 23:20:52 +0800
Subject: [PATCH 001/123] Revert "Update README-zh.md"

This reverts commit 931516084bcf2012fef4a597e929046fb7a72035.
---
 README-zh.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README-zh.md b/README-zh.md
index f9ea8f69..d7171abb 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -25,7 +25,7 @@
 
 ### [ Wiki→ 正在进行快速更新](https://gitee.com/WPFDevelopersOrg/WPFDevelopers/wikis/pages)   
 
-### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star🌟</kbd>。   
+### 此项目包含了 微信公众号 《 WPF开发者》 日常开发分享，欢迎<kbd>Star</kbd>。   
 
 ### 运行环境 Visual Studio 2022  
 

From 5f5a5ea09593c1cc1e9e1e890ab4fbaddd12ba0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 27 May 2024 23:28:48 +0800
Subject: [PATCH 002/123] Reapply "dev pull request master"

This reverts commit 2ee5e3685a1d7499bcc8b8e4b807c858d97a3472.
---
 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.cs     |  50 +-
 .../Controls/NavigateMenu/NavigateMenu.xaml   | 158 ++++++
 .../AcrylicBlurWindowExample.xaml             |  12 +-
 .../ExampleViews/AnimationAudioExample.xaml   |  14 +-
 .../AnimationNavigationBar3DExample.xaml      |  96 +++-
 .../ExampleViews/BarrageExample.xaml          |   4 +-
 .../ExampleViews/BasicBarChartExample.xaml    |  57 --
 .../ExampleViews/BasicControlsExample.xaml    |  96 ++--
 .../ExampleViews/BreatheLightExample.xaml     | 322 ++++++-----
 .../ExampleViews/BubblleControlExample.xaml   |  14 +-
 .../ExampleViews/CarouselExample.xaml         |   6 +-
 .../ExampleViews/CarouselExampleEx.xaml       |   6 +-
 .../ExampleViews/ChartBarExample.xaml         |  52 ++
 ...xample.xaml.cs => ChartBarExample.xaml.cs} |  21 +-
 .../ExampleViews/ChartLineExample.xaml        |  40 ++
 .../ExampleViews/ChartLineExample.xaml.cs     |  62 +++
 ...artExample.xaml => ChartRadarExample.xaml} |  20 +-
 ...mple.xaml.cs => ChartRadarExample.xaml.cs} |  45 +-
 .../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 +-
 .../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 +++
 .../RadarChart.cs => Charts/ChartRadar.cs}    | 127 +++--
 .../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 +-
 .../{WPFMessageBox.cs => WDMessageBox.cs}     |  61 ++-
 .../Controls/Pagination/Pagination.cs         |  11 +
 .../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, 5467 insertions(+), 1709 deletions(-)
 rename src/{WPFDevelopers.Shared => WPFDevelopers.Samples.Shared}/Controls/NavigateMenu/NavigateMenu.cs (67%)
 create mode 100644 src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{BasicBarChartExample.xaml.cs => ChartBarExample.xaml.cs} (81%)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{RadarChartExample.xaml => ChartRadarExample.xaml} (75%)
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{RadarChartExample.xaml.cs => ChartRadarExample.xaml.cs} (69%)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
 rename src/WPFDevelopers.Shared/Controls/{RadarChart/RadarChart.cs => Charts/ChartRadar.cs} (50%)
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs
 rename src/WPFDevelopers.Shared/Controls/MessageBox/{WPFMessageBox.cs => WDMessageBox.cs} (74%)
 delete mode 100644 src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
 create mode 100644 src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs
 create mode 100644 src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs
 create mode 100644 src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs
 create mode 100644 src/WPFDevelopers.Shared/LanguageManager.cs
 create mode 100644 src/WPFDevelopers.Shared/Languages/Language.Designer.cs
 create mode 100644 src/WPFDevelopers.Shared/Languages/Language.en-US.resx
 create mode 100644 src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
 create mode 100644 src/WPFDevelopers.Shared/Languages/Language.resx
 delete 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 2847a498..04a35980 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -3,6 +3,7 @@
     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" />
@@ -74,7 +75,8 @@
                                                 Padding="0"
                                                 Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Rectangle
                                                         x:Name="MinimizeGlyph"
@@ -90,7 +92,8 @@
                                                 Padding="0"
                                                 Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
                                                         Width="10"
@@ -109,6 +112,7 @@
                                                 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
@@ -128,7 +132,8 @@
                                             Name="PART_CloseButton"
                                             Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
                                             IsTabStop="False"
-                                            Style="{DynamicResource WD.WindowButtonStyle}">
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
+                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
                                             <Path
                                                 Width="10"
                                                 Height="10"
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index c7c95c67..03ddea0a 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: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">
+<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">
 	<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,6 +145,8 @@
 	<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" />
@@ -157,16 +159,16 @@
 			</DataTrigger>
 		</Style.Triggers>
 	</Style>
-	<convert:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
-	<convert:HalfValueConverter x:Key="WD.HalfValueConverter" />
-	<convert:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+	<converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
+	<converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
+	<converts: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>
-	<convert:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
-	<convert:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
+	<converts:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
+	<converts: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">
@@ -346,26 +348,26 @@
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
-	<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" />
+	<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" />
 	<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>
-	<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" />
+	<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" />
 	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
 		<GradientStop Color="#FF0000" />
 		<GradientStop Offset="0.167" Color="#FF00FF" />
@@ -772,23 +774,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}">
+											<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}}">
 												<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}">
+											<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}}">
 												<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}" Visibility="Collapsed">
+											<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">
 												<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}">
+										<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}}">
 											<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
 										</Button>
 									</WrapPanel>
@@ -860,7 +862,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">
-								<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+								<VirtualizingStackPanel 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" />
@@ -940,9 +942,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="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 						<ScrollViewer Margin="0,4" CanContentScroll="True">
-							<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+							<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 						</ScrollViewer>
 					</Border>
 				</Popup>
@@ -1401,14 +1403,28 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
+	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RepeatButton}">
-					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+				<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>
 			</Setter.Value>
 		</Setter>
@@ -1425,10 +1441,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>
-						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
+						<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}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<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}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1461,10 +1477,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>
-						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Up" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Down" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1612,6 +1628,9 @@
 						<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>
@@ -1624,6 +1643,23 @@
 						<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>
@@ -2203,7 +2239,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 TemplatedParent}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+						<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.Effect>
 								<DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
 							</Border.Effect>
@@ -2378,14 +2414,6 @@
 								<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">
@@ -2398,7 +2426,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,1,1,0" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Background" Value="{x:Null}" />
 		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -2411,24 +2439,29 @@
 		<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}">
-					<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
+					<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">
 							<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 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 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}}}" />
 										<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}}" />
@@ -2444,13 +2477,7 @@
 							</ScrollViewer.Template>
 							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						</ScrollViewer>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Disabled" />
-								<VisualState x:Name="Normal" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
+					</controls:WDBorder>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2571,7 +2598,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
 					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
+						<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 							<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}}}" />
@@ -2579,26 +2606,6 @@
 						</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>
@@ -2641,7 +2648,7 @@
 						</Storyboard>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel>
-						<Border x:Name="columnHeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
@@ -2725,11 +2732,6 @@
 									</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>
@@ -2773,11 +2775,6 @@
 									</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>
@@ -2814,12 +2811,12 @@
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="2" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type TabControl}">
-					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid ClipToBounds="True" KeyboardNavigation.TabNavigation="Local" SnapsToDevicePixels="True">
+					<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}">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Name="ColumnDefinition0" />
 								<ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -2828,14 +2825,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">
-								<TabPanel Name="HeaderPanel" Margin="2,2,2,0" 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" 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>
 							<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>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -2843,6 +2840,7 @@
 							<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">
@@ -2853,6 +2851,7 @@
 							<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,6 +2863,7 @@
 							<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,6 +2891,9 @@
 						<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>
@@ -2900,6 +2903,16 @@
 						<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>
@@ -2911,20 +2924,21 @@
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Expander}">
-					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<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">
 						<DockPanel>
-							<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 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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -2956,13 +2970,18 @@
 															</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" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
+							<Border x:Name="PART_Content" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
 								<Border.RenderTransform>
 									<ScaleTransform ScaleY="0" />
 								</Border.RenderTransform>
@@ -2973,6 +2992,8 @@
 					<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" />
@@ -2986,10 +3007,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3028,6 +3050,11 @@
 															</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>
@@ -3042,10 +3069,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -3079,6 +3107,11 @@
 															</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>
@@ -3098,10 +3131,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3140,6 +3174,11 @@
 															</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>
@@ -3153,6 +3192,7 @@
 								<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>
@@ -3170,6 +3210,7 @@
 								<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>
@@ -3187,6 +3228,7 @@
 								<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>
@@ -3204,6 +3246,7 @@
 								<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>
@@ -3225,18 +3268,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>
+					<Grid Margin="{TemplateBinding Margin}">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+						<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">
 							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
+						<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">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3250,16 +3294,16 @@
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
 		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0,1,0,0" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListBox}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ScrollViewer Focusable="False">
+					<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">
 							<VirtualizingStackPanel IsItemsHost="True" />
 						</ScrollViewer>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsGrouping" Value="True">
 							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
@@ -3314,20 +3358,16 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<Grid Background="{TemplateBinding Background}">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
+					<controls:SmallPanel>
 						<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" Grid.Row="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
+						<ScrollBar Name="PART_HorizontalScrollBar" VerticalAlignment="Bottom" 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}" />
-					</Grid>
+					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3390,8 +3430,24 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListView}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 						<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>
@@ -3456,12 +3512,12 @@
 							</PointAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Border x:Name="PART_TemplateRoot">
+					<controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 						<controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
-							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
 							<Rectangle x:Name="PART_Track" />
 							<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
 							</Decorator>
 							<Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
 								<Rectangle.RenderTransform>
@@ -3469,7 +3525,7 @@
 								</Rectangle.RenderTransform>
 							</Rectangle>
 						</controls:SmallPanel>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="Orientation" Value="Vertical">
 							<Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -3485,7 +3541,6 @@
 							</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>
@@ -3545,11 +3600,11 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ScrollViewer Padding="{TemplateBinding Padding}" CanContentScroll="False" Focusable="False">
+					<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">
 							<ItemsPresenter />
 						</ScrollViewer>
-					</Border>
+					</controls:WDBorder>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3673,7 +3728,7 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultTreeView}" TargetType="{x:Type TreeView}" />
 	<Style BasedOn="{StaticResource WD.DefaultTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
-	<Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
+	<Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
@@ -3688,7 +3743,7 @@
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WPFMessageBox}">
+				<ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
 					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<Grid>
 							<Grid.RowDefinitions>
@@ -3699,7 +3754,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}">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3710,10 +3765,12 @@
 									<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">
+							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
 								<UniformGrid Height="38" Rows="1">
-									<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}" />
+									<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" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>
@@ -3722,7 +3779,7 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
+	<Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
 	<Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
 		<Setter Property="Width" Value="40" />
 		<Setter Property="Height" Value="40" />
@@ -5083,99 +5140,6 @@
 	<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" />
@@ -5269,29 +5233,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="方框">
+									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="椭圆">
+									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="箭头">
+									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="画笔">
+									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="文字">
+									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="保存">
+									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="取消">
+									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="完成">
+									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
 										<controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
 									</Button>
 								</WrapPanel>
@@ -5404,6 +5368,9 @@
 							<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" />
@@ -5473,12 +5440,14 @@
 		<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 Background="{TemplateBinding Background}">
+					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition />
@@ -5536,10 +5505,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}" Visibility="Collapsed">
+							<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">
 								<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}">
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
 								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
@@ -6025,7 +5994,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" />
+						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" Visibility="Collapsed" />
 					</Canvas>
 				</ControlTemplate>
 			</Setter.Value>
@@ -6071,7 +6040,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="关闭">
+								<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}}">
 									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
@@ -6645,9 +6614,17 @@
 					<ColumnDefinition Width="5" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+				<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>
 				<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" Maximum="100000" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-				<TextBlock Grid.Column="3" VerticalAlignment="Center" Text=" 条 / 页" />
+				<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>
 				<Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 					<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
 				</Button>
@@ -6683,11 +6660,15 @@
 								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<TextBlock Margin="0,0,15,0" VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+							<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>
 							<StackPanel Grid.Column="1" Margin="0,0,15,0" Orientation="Horizontal">
-								<TextBlock VerticalAlignment="Center" Text="每页 " />
+								<TextBlock Margin="0,0,3,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
 								<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock VerticalAlignment="Center" Text=" 条" />
+								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
 							</StackPanel>
 							<Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 								<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
@@ -6703,9 +6684,9 @@
 								<controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
 							</Button>
 							<StackPanel Grid.Column="5" Orientation="Horizontal">
-								<TextBlock VerticalAlignment="Center" Text=" 前往 " />
+								<TextBlock Margin="3,0" VerticalAlignment="Center" Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
 								<controls:NumericBox x:Name="PART_JumpPageNumericBox" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock VerticalAlignment="Center" Text=" 页" />
+								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
 							</StackPanel>
 						</Grid>
 					</Border>
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
index 2257a905..686e2ba2 100644
--- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
+++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -1,7 +1,9 @@
 <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 8a45c79e..b3e008ae 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -3,6 +3,7 @@
     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
@@ -80,7 +81,8 @@
                                                 Padding="0"
                                                 Command="SystemCommands.MinimizeWindowCommand"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Rectangle
                                                         x:Name="MinimizeGlyph"
@@ -96,7 +98,8 @@
                                                 Padding="0"
                                                 Command="SystemCommands.MaximizeWindowCommand"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}"
+                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
                                                         Width="10"
@@ -115,6 +118,7 @@
                                                 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
@@ -134,7 +138,8 @@
                                             Name="PART_CloseButton"
                                             Command="SystemCommands.CloseWindowCommand"
                                             IsTabStop="False"
-                                            Style="{DynamicResource WD.WindowButtonStyle}">
+                                            Style="{DynamicResource WD.WindowButtonStyle}"
+                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
                                             <Path
                                                 Width="10"
                                                 Height="10"
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index 30c8b2fd..a09c4935 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: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">
+<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">
 	<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,6 +145,8 @@
 	<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" />
@@ -157,16 +159,16 @@
 			</DataTrigger>
 		</Style.Triggers>
 	</Style>
-	<convert:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
-	<convert:HalfValueConverter x:Key="WD.HalfValueConverter" />
-	<convert:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+	<converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
+	<converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
+	<converts: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>
-	<convert:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
-	<convert:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
+	<converts:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
+	<converts: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">
@@ -346,26 +348,26 @@
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
-	<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" />
+	<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" />
 	<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>
-	<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" />
+	<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" />
 	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
 		<GradientStop Color="#FF0000" />
 		<GradientStop Offset="0.167" Color="#FF00FF" />
@@ -773,23 +775,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}">
+											<Button Name="PART_MinimizeButton" Padding="0" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
 												<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}">
+											<Button Name="PART_MaximizeButton" Padding="0" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
 												<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}" Visibility="Collapsed">
+											<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">
 												<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}">
+										<Button Name="PART_CloseButton" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
 											<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
 										</Button>
 									</WrapPanel>
@@ -861,7 +863,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">
-								<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+								<VirtualizingStackPanel 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" />
@@ -941,9 +943,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="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 						<ScrollViewer Margin="0,4" CanContentScroll="True">
-							<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+							<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 						</ScrollViewer>
 					</Border>
 				</Popup>
@@ -1402,14 +1404,28 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
+	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RepeatButton}">
-					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+				<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>
 			</Setter.Value>
 		</Setter>
@@ -1426,10 +1442,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>
-						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
+						<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}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<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}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1462,10 +1478,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>
-						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Up" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Down" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1613,6 +1629,9 @@
 						<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>
@@ -1625,6 +1644,23 @@
 						<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>
@@ -2204,7 +2240,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 TemplatedParent}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+						<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.Effect>
 								<DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
 							</Border.Effect>
@@ -2379,14 +2415,6 @@
 								<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">
@@ -2399,7 +2427,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,1,1,0" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Background" Value="{x:Null}" />
 		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -2412,24 +2440,29 @@
 		<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}">
-					<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
+					<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">
 							<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 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 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}}}" />
 										<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}}" />
@@ -2445,13 +2478,7 @@
 							</ScrollViewer.Template>
 							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						</ScrollViewer>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Disabled" />
-								<VisualState x:Name="Normal" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
+					</controls:WDBorder>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2572,7 +2599,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
 					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
+						<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 							<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}}}" />
@@ -2580,26 +2607,6 @@
 						</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>
@@ -2642,7 +2649,7 @@
 						</Storyboard>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel>
-						<Border x:Name="columnHeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
@@ -2726,11 +2733,6 @@
 									</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>
@@ -2774,11 +2776,6 @@
 									</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>
@@ -2815,12 +2812,12 @@
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="2" />
+		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type TabControl}">
-					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid ClipToBounds="True" KeyboardNavigation.TabNavigation="Local" SnapsToDevicePixels="True">
+					<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}">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Name="ColumnDefinition0" />
 								<ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -2829,14 +2826,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">
-								<TabPanel Name="HeaderPanel" Margin="2,2,2,0" 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" 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>
 							<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>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -2844,6 +2841,7 @@
 							<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">
@@ -2854,6 +2852,7 @@
 							<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">
@@ -2865,6 +2864,7 @@
 							<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,6 +2892,9 @@
 						<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>
@@ -2901,6 +2904,16 @@
 						<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>
@@ -2912,20 +2925,21 @@
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Expander}">
-					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+					<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">
 						<DockPanel>
-							<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 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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -2957,13 +2971,18 @@
 															</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" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
+							<Border x:Name="PART_Content" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
 								<Border.RenderTransform>
 									<ScaleTransform ScaleY="0" />
 								</Border.RenderTransform>
@@ -2974,6 +2993,8 @@
 					<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" />
@@ -2987,10 +3008,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3029,6 +3051,11 @@
 															</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>
@@ -3043,10 +3070,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -3080,6 +3108,11 @@
 															</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>
@@ -3099,10 +3132,11 @@
 							<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="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3141,6 +3175,11 @@
 															</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>
@@ -3154,6 +3193,7 @@
 								<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>
@@ -3171,6 +3211,7 @@
 								<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>
@@ -3188,6 +3229,7 @@
 								<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>
@@ -3205,6 +3247,7 @@
 								<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>
@@ -3226,18 +3269,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>
+					<Grid Margin="{TemplateBinding Margin}">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
+						<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">
 							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
+						<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">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3251,16 +3295,16 @@
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
 		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0,1,0,0" />
+		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListBox}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ScrollViewer Focusable="False">
+					<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">
 							<VirtualizingStackPanel IsItemsHost="True" />
 						</ScrollViewer>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsGrouping" Value="True">
 							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
@@ -3315,20 +3359,16 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<Grid Background="{TemplateBinding Background}">
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
+					<controls:SmallPanel>
 						<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" Grid.Row="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
+						<ScrollBar Name="PART_HorizontalScrollBar" VerticalAlignment="Bottom" 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}" />
-					</Grid>
+					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3391,8 +3431,24 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListView}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 						<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>
@@ -3457,12 +3513,12 @@
 							</PointAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Border x:Name="PART_TemplateRoot">
+					<controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
 						<controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
-							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
 							<Rectangle x:Name="PART_Track" />
 							<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
 							</Decorator>
 							<Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
 								<Rectangle.RenderTransform>
@@ -3470,7 +3526,7 @@
 								</Rectangle.RenderTransform>
 							</Rectangle>
 						</controls:SmallPanel>
-					</Border>
+					</controls:WDBorder>
 					<ControlTemplate.Triggers>
 						<Trigger Property="Orientation" Value="Vertical">
 							<Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -3486,7 +3542,6 @@
 							</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>
@@ -3546,11 +3601,11 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ScrollViewer Padding="{TemplateBinding Padding}" CanContentScroll="False" Focusable="False">
+					<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">
 							<ItemsPresenter />
 						</ScrollViewer>
-					</Border>
+					</controls:WDBorder>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3674,7 +3729,7 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultTreeView}" TargetType="{x:Type TreeView}" />
 	<Style BasedOn="{StaticResource WD.DefaultTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
-	<Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
+	<Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
@@ -3689,7 +3744,7 @@
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WPFMessageBox}">
+				<ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
 					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<Grid>
 							<Grid.RowDefinitions>
@@ -3700,7 +3755,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}">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3711,10 +3766,12 @@
 									<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">
+							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
 								<UniformGrid Height="38" Rows="1">
-									<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}" />
+									<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" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>
@@ -3723,13 +3780,13 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
-	<Style x:Key="WD.DefaultLoading" TargetType="{x:Type controls:DefaultLoading}">
+	<Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
+	<Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
 		<Setter Property="Width" Value="40" />
 		<Setter Property="Height" Value="40" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:DefaultLoading}">
+				<ControlTemplate TargetType="{x:Type controls:NormalLoading}">
 					<Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
 						<controls:SmallPanel>
 							<controls:SmallPanel.Resources>
@@ -3757,20 +3814,18 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.NormalLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NormalLoading}">
+	<Style x:Key="WD.DefaultLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:DefaultLoading}">
 		<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:NormalLoading}">
+				<ControlTemplate TargetType="{x:Type controls:DefaultLoading}">
 					<ControlTemplate.Resources>
 						<Storyboard x:Key="WD.PlayStoryboard" RepeatBehavior="Forever">
-							<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)">
+							<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)">
 								<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" />
@@ -3795,24 +3850,18 @@
 					</ControlTemplate.Resources>
 					<controls:SmallPanel x:Name="PART_SmallPanel" RenderTransformOrigin=".5,.5">
 						<controls:SmallPanel.RenderTransform>
-							<TransformGroup>
-								<RotateTransform />
-							</TransformGroup>
+							<RotateTransform />
 						</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>
-								<TransformGroup>
-									<RotateTransform />
-								</TransformGroup>
+								<RotateTransform />
 							</shapes:Arc.RenderTransform>
 						</shapes:Arc>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
-						<Trigger Property="IsIndeterminate" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
-							</Trigger.EnterActions>
-						</Trigger>
+						<EventTrigger RoutedEvent="Loaded">
+							<BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
+						</EventTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -5092,99 +5141,6 @@
 	<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" />
@@ -5278,29 +5234,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="方框">
+									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="椭圆">
+									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="箭头">
+									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="画笔">
+									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="文字">
+									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="保存">
+									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="取消">
+									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
 										<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="完成">
+									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
 										<controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
 									</Button>
 								</WrapPanel>
@@ -5413,6 +5369,9 @@
 							<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" />
@@ -5482,12 +5441,14 @@
 		<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 Background="{TemplateBinding Background}">
+					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition />
@@ -5545,10 +5506,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}" Visibility="Collapsed">
+							<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">
 								<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}">
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
 								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
@@ -6034,7 +5995,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" />
+						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" Visibility="Collapsed" />
 					</Canvas>
 				</ControlTemplate>
 			</Setter.Value>
@@ -6080,7 +6041,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="关闭">
+								<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}}">
 									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
@@ -6654,9 +6615,17 @@
 					<ColumnDefinition Width="5" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+				<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>
 				<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" Maximum="100000" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-				<TextBlock Grid.Column="3" VerticalAlignment="Center" Text=" 条 / 页" />
+				<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>
 				<Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 					<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
 				</Button>
@@ -6692,11 +6661,15 @@
 								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<TextBlock Margin="0,0,15,0" VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+							<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>
 							<StackPanel Grid.Column="1" Margin="0,0,15,0" Orientation="Horizontal">
-								<TextBlock VerticalAlignment="Center" Text="每页 " />
+								<TextBlock Margin="0,0,3,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
 								<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock VerticalAlignment="Center" Text=" 条" />
+								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
 							</StackPanel>
 							<Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 								<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
@@ -6712,9 +6685,9 @@
 								<controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
 							</Button>
 							<StackPanel Grid.Column="5" Orientation="Horizontal">
-								<TextBlock VerticalAlignment="Center" Text=" 前往 " />
+								<TextBlock Margin="3,0" VerticalAlignment="Center" Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
 								<controls:NumericBox x:Name="PART_JumpPageNumericBox" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock VerticalAlignment="Center" Text=" 页" />
+								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
 							</StackPanel>
 						</Grid>
 					</Border>
diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index 4a1256a3..a88a6a9b 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -1,9 +1,10 @@
 <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>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+		<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.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
index a4eba48e..39a3bf78 100644
--- a/src/WPFDevelopers.Samples.Shared/App.xaml
+++ b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -29,6 +29,8 @@
                 <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.Shared/Controls/NavigateMenu/NavigateMenu.cs b/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs
similarity index 67%
rename from src/WPFDevelopers.Shared/Controls/NavigateMenu/NavigateMenu.cs
rename to src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs
index 6f47dff9..a14ccaae 100644
--- a/src/WPFDevelopers.Shared/Controls/NavigateMenu/NavigateMenu.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs
@@ -5,7 +5,7 @@
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     [TemplatePart(Name = ListBoxTemplateName, Type = typeof(ListBox))]
     [TemplatePart(Name = RectangleTemplateName, Type = typeof(Rectangle))]
@@ -27,6 +27,7 @@ public class NavigateMenu : ListBox
         private ListBox _listBox;
         private Rectangle _rectangle;
         private TranslateTransform _translateTransform;
+        private double _lastY = 0d;
 
 
         static NavigateMenu()
@@ -37,14 +38,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);
         }
 
@@ -52,9 +53,7 @@ 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;
@@ -75,9 +74,11 @@ 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:
@@ -96,43 +97,6 @@ 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.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml b/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
new file mode 100644
index 00000000..bea80d47
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
@@ -0,0 +1,158 @@
+<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 f0ae2710..7b853af8 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+        xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
         mc:Ignorable="d" WindowStartupLocation="CenterScreen"
         ResizeMode="CanMinimize"
         Title="Login" Height="350" Width="400">
-    <wpfdev:WindowAcrylicBlur.WindowAcrylicBlur>
-        <wpfdev:WindowAcrylicBlur BlurColor="AliceBlue" Opacity="0.2"/>
-    </wpfdev:WindowAcrylicBlur.WindowAcrylicBlur>
+    <wd:WindowAcrylicBlur.WindowAcrylicBlur>
+        <wd:WindowAcrylicBlur BlurColor="AliceBlue" Opacity="0.2"/>
+    </wd: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 wpfdev:ElementHelper.Watermark="账户" Margin="0,20,0,0" Cursor="Hand"/>
-            <PasswordBox  wpfdev:ElementHelper.Watermark="密码"  Margin="0,20,0,0" Cursor="Hand"/>
+            <TextBox wd:ElementHelper.Watermark="账户" Margin="0,20,0,0" Cursor="Hand"/>
+            <PasswordBox  wd: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 42a5b9e6..ce59e168 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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">
-            <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
+            <wd: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>
-            </wpfdev:BreathLamp>
-            <wpfdev:AnimationAudio x:Name="AnimationAudioLeft" MouseDown="AnimationAudioLeft_MouseDown"/>
+            </wd:BreathLamp>
+            <wd:AnimationAudio x:Name="AnimationAudioLeft" MouseDown="AnimationAudioLeft_MouseDown"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Right">
-            <wpfdev:AnimationAudio x:Name="AnimationAudioRight" IsRight ="true" 
+            <wd:AnimationAudio x:Name="AnimationAudioRight" IsRight ="true" 
                                Background="{DynamicResource WD.SuccessSolidColorBrush}"
                                Foreground="Black"
                                MouseDown="AnimationAudioLeft_MouseDown"/>
-            <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Streamer"  IsLampStart="True"
+            <wd: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>
-            </wpfdev:BreathLamp>
+            </wd: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 5dd6b579..45122367 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
@@ -20,34 +20,77 @@
                 Height="235"
                 Margin="10,0"
                 VerticalAlignment="Top"
-                Background="#F9F7F9"
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                 SnapsToDevicePixels="True">
                 <wd:AnimationNavigationBar3D VerticalAlignment="Bottom">
-                    <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: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:AnimationNavigationBar3D>
             </Border>
             <Border
@@ -75,7 +118,6 @@
                     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 4b0817eb..f9ce9740 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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"
-                     wpfdev:ElementHelper.Watermark="请弹幕内容"/>
+                     wd: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
deleted file mode 100644
index eb5894aa..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml
+++ /dev/null
@@ -1,57 +0,0 @@
-<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/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 569f7811..791196ee 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"
-                            Content="Default"
-                            IsEnabled="False" />
+                            wd:ElementHelper.CornerRadius="3"
+                            Content="Default" />
                         <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,6 +310,7 @@
                         <CheckBox Content="Option A" />
                         <CheckBox
                             Margin="10,0"
+                            wd:ElementHelper.CornerRadius="3"
                             Content="Option B"
                             IsChecked="True" />
                         <CheckBox Content="Option C" IsChecked="{x:Null}" />
@@ -323,8 +324,11 @@
                         FontSize="20"
                         Text="TextBox" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <TextBox />
-                        <TextBox Margin="10,0" wd:ElementHelper.Watermark="TextBox" />
+                        <TextBox wd:ElementHelper.CornerRadius="3" />
+                        <TextBox
+                            Margin="10,0"
+                            wd:ElementHelper.IsClear="True"
+                            wd:ElementHelper.Watermark="TextBox" />
                         <TextBox IsEnabled="False" />
                     </UniformGrid>
                     <TextBlock
@@ -332,8 +336,11 @@
                         FontSize="20"
                         Text="PasswordBox" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <PasswordBox />
-                        <PasswordBox Margin="10,0" wd:ElementHelper.Watermark="PasswordBox" />
+                        <PasswordBox wd:ElementHelper.CornerRadius="3" />
+                        <PasswordBox
+                            Margin="10,0"
+                            wd:ElementHelper.IsClear="True"
+                            wd:ElementHelper.Watermark="PasswordBox" />
                         <PasswordBox IsEnabled="False" />
                         <PasswordBox
                             x:Name="myPasswordBox"
@@ -357,7 +364,10 @@
                             <ComboBoxItem>Option 5</ComboBoxItem>
                         </ComboBox>
                         <ComboBox Margin="10,0" IsEnabled="False" />
-                        <ComboBox wd:ElementHelper.Watermark="ComboBox" IsEditable="True">
+                        <ComboBox
+                            wd:ElementHelper.CornerRadius="3"
+                            wd:ElementHelper.Watermark="ComboBox"
+                            IsEditable="True">
                             <ComboBoxItem>Option 1</ComboBoxItem>
                             <ComboBoxItem>Option 2</ComboBoxItem>
                             <ComboBoxItem>Option 3</ComboBoxItem>
@@ -386,7 +396,7 @@
                         FontSize="20"
                         Text="DatePicker" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <DatePicker wd:DatePickerHelper.Watermark="日期 yyyy/MM/dd" />
+                        <DatePicker wd:DatePickerHelper.Watermark="日期 yyyy/MM/dd" wd:ElementHelper.CornerRadius="3" />
                         <DatePicker
                             Margin="10,0"
                             wd:DatePickerHelper.Watermark="DatePicker"
@@ -403,7 +413,7 @@
                         FontSize="20"
                         Text="Calendar" />
                     <WrapPanel Margin="0,10">
-                        <Calendar />
+                        <Calendar wd:ElementHelper.CornerRadius="3" />
                         <Calendar Margin="10,0" SelectionMode="SingleRange" />
                         <Calendar SelectionMode="MultipleRange">
                             <Calendar.BlackoutDates>
@@ -417,7 +427,7 @@
                         FontSize="20"
                         Text="Slider" />
                     <WrapPanel Margin="0,10">
-                        <Slider Width="200" />
+                        <Slider Width="200" wd:ElementHelper.CornerRadius="3" />
                         <Slider
                             Width="200"
                             Margin="10,0"
@@ -428,6 +438,12 @@
                             IsEnabled="False"
                             Maximum="100"
                             Value="50" />
+                        <Slider
+                            Height="200"
+                            Maximum="10"
+                            Minimum="0"
+                            Orientation="Vertical"
+                            Value="3" />
                     </WrapPanel>
 
                     <TextBlock
@@ -435,7 +451,10 @@
                         FontSize="20"
                         Text="ProgressBar" />
                     <WrapPanel Margin="0,10">
-                        <ProgressBar Width="200" Value="50" />
+                        <ProgressBar
+                            Width="200"
+                            wd:ElementHelper.CornerRadius="3"
+                            Value="50" />
                         <ProgressBar
                             Width="200"
                             Margin="10,0"
@@ -446,19 +465,25 @@
                             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 Margin="0,10" BorderThickness="0">
+                    <TabControl Height="200" Margin="0,10">
                         <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}}"
@@ -570,8 +595,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>
@@ -591,7 +616,7 @@
                         FontSize="20"
                         Text="ListView" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <ListView ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                        <ListView wd:ElementHelper.CornerRadius="3" ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn DisplayMemberBinding="{Binding Date}" Header="Date" />
@@ -606,7 +631,6 @@
                         <ListView
                             Margin="10,0"
                             BorderThickness="0"
-                            IsEnabled="False"
                             ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <ListView.View>
                                 <GridView>
@@ -629,7 +653,7 @@
                         Height="400"
                         Margin="0,10"
                         Columns="2">
-                        <TreeView ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                        <TreeView wd:ElementHelper.CornerRadius="3" ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <TreeView.ItemTemplate>
                                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                                     <Border>
@@ -641,7 +665,6 @@
                         <TreeView
                             Margin="10,0"
                             BorderThickness="0"
-                            IsEnabled="False"
                             ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <TreeView.ItemTemplate>
                                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">
@@ -658,7 +681,7 @@
                         FontSize="20"
                         Text="Expander" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <Expander Header="Expander1">
+                        <Expander wd:ElementHelper.CornerRadius="3" Header="Expander1">
                             <Rectangle
                                 Width="400"
                                 Height="300"
@@ -710,16 +733,13 @@
                         FontSize="20"
                         Text="GroupBox" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <GroupBox Header="GroupBox1">
+                        <GroupBox wd:ElementHelper.CornerRadius="3" Header="GroupBox1">
                             <Rectangle
                                 Width="400"
                                 Height="300"
                                 Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                         </GroupBox>
-                        <GroupBox
-                            Margin="10,0"
-                            Header="GroupBox1"
-                            IsEnabled="False">
+                        <GroupBox Margin="10,0" Header="GroupBox1">
                             <Rectangle
                                 Width="400"
                                 Height="300"
@@ -742,25 +762,25 @@
                                 <Setter Property="Height" Value="400" />
                             </Style>
                         </UniformGrid.Resources>
-                        <TabControl Margin="4">
-                            <TabItem Padding="20,0" Header="TabItem1">
+                        <TabControl Margin="4" wd:ElementHelper.CornerRadius="3">
+                            <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Header="TabItem2">
+                            <TabItem Padding="10" Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Header="TabItem3">
+                            <TabItem Padding="10" Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Bottom">
-                            <TabItem Padding="20,0" Header="TabItem1">
+                            <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Header="TabItem2">
+                            <TabItem Padding="10" Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Header="TabItem3">
+                            <TabItem Padding="10" 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 a358774c..bfe7858c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
@@ -1,149 +1,201 @@
-<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">
+<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">
     <controls:CodeViewer>
-    <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>
+        <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>
 
-                <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>
+                    <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>
 
-        <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>
+            <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>
 
-                <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" 
+                    <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"
                         HorizontalAlignment="Right"
-                        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>
+                        VerticalAlignment="Bottom"
+                        Content="进入直播"
+                        Style="{StaticResource WD.PrimaryButton}" />
+                </Grid>
+            </Border>
+            <Border
+                Width="400"
+                Height="140"
+                Background="{StaticResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="3"
+                Effect="{StaticResource WD.NormalShadowDepth}">
 
-                <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" 
+                <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"
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Bottom" Content="进入直播" Width="100"/>
-            </Grid>
-        </Border>
+                        VerticalAlignment="Bottom"
+                        Content="进入直播"
+                        Style="{StaticResource WD.PrimaryButton}" />
+                </Grid>
+            </Border>
 
-        <Border Effect="{StaticResource WD.NormalShadowDepth}" Width="400" Height="140" Background="{StaticResource WD.BackgroundSolidColorBrush}"
-                CornerRadius="3">
+            <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>
-                <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>
+                <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>
 
-                <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>
+                    <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>
         <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 76b3fd87..ce14c814 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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="随机">
-                <wpfdev:BubblleControl x:Name="MyBubblleControl"  Click="BubblleControl_Click">
-                    <wpfdev:BubblleControl.ItemsSource>
+                <wd:BubblleControl x:Name="MyBubblleControl"  Click="BubblleControl_Click">
+                    <wd: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>
-                    </wpfdev:BubblleControl.ItemsSource>
-                </wpfdev:BubblleControl>
+                    </wd:BubblleControl.ItemsSource>
+                </wd:BubblleControl>
             </TabItem>
             <TabItem Header="自定义">
-                <wpfdev:BubblleCanvas Width="400" Height="400">
+                <wd:BubblleCanvas Width="400" Height="400">
                     <Grid>
                         <Grid Width="60" 
                               Height="60">
@@ -94,7 +94,7 @@
                             </Hyperlink>
                         </TextBlock>
                     </Grid>
-                </wpfdev:BubblleCanvas>
+                </wd: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 7e18545e..198b3012 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:MasterCarousel IsStartAinimation="True" PlaySpeed="5000">
+        <wd: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"/>
-        </wpfdev:MasterCarousel>
+        </wd: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 ba630181..2fbca0dd 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:EmphasizerCarousel>
+        <wd: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"/>
-        </wpfdev:EmphasizerCarousel>
+        </wd: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
new file mode 100644
index 00000000..20485c13
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml
@@ -0,0 +1,52 @@
+<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/BasicBarChartExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
similarity index 81%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
index 04e7bdc0..c5b48bfd 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
@@ -1,23 +1,14 @@
-using System;
-using System.Collections.Generic;
+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>
-    /// BasicBarChartExample.xaml 的交互逻辑
+    /// ChartBarExample.xaml 的交互逻辑
     /// </summary>
-    public partial class BasicBarChartExample : UserControl
+    public partial class ChartBarExample : UserControl
     {
         public IEnumerable<KeyValuePair<string, double>> SeriesModels
         {
@@ -26,7 +17,7 @@ public IEnumerable<KeyValuePair<string, double>> SeriesModels
         }
 
         public static readonly DependencyProperty SeriesModelsProperty =
-            DependencyProperty.Register("SeriesModels", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(BasicBarChartExample), new PropertyMetadata(null));
+            DependencyProperty.Register("SeriesModels", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(ChartBarExample), new PropertyMetadata(null));
 
 
         Dictionary<string, IEnumerable<KeyValuePair<string, double>>> keyValues = new Dictionary<string, IEnumerable<KeyValuePair<string, double>>>();
@@ -36,9 +27,9 @@ public string KeyBarChart
             set { SetValue(KeyBarChartProperty, value); }
         }
         public static readonly DependencyProperty KeyBarChartProperty =
-     DependencyProperty.Register("KeyBarChart", typeof(string), typeof(BasicBarChartExample), new PropertyMetadata(null));
+     DependencyProperty.Register("KeyBarChart", typeof(string), typeof(ChartBarExample), new PropertyMetadata(null));
         private int _index = 0;
-        public BasicBarChartExample()
+        public ChartBarExample()
         {
             InitializeComponent();
             var Models1 = new[]
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
new file mode 100644
index 00000000..26a69c63
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
@@ -0,0 +1,40 @@
+<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
new file mode 100644
index 00000000..6da42b8a
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
@@ -0,0 +1,62 @@
+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/RadarChartExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
similarity index 75%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
index 3b7c834c..705ce488 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
@@ -1,12 +1,12 @@
 <UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.RadarChartExample"
+    x:Class="WPFDevelopers.Samples.ExampleViews.ChartRadarExample"
     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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     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:RadarChartExample}}" />
+                        Text="{Binding NowPlayerName, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
                 </WrapPanel>
-                <wpfdev:RadarChart
+                <wd:ChartRadar
                     Grid.Row="1"
                     Grid.Column="0"
-                    RadarArray="{Binding RadarModels, RelativeSource={RelativeSource AncestorType=local:RadarChartExample}}" />
+                    Datas="{Binding Datas, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
                 <Button
                     Grid.Row="2"
                     Width="200"
@@ -56,12 +56,8 @@
             </Grid>
         </Border>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RadarChartExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RadarChartExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartRadarExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartRadarExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
similarity index 69%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
index b7837dc4..d946a885 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
@@ -10,17 +10,19 @@
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    /// RadarChartExample.xaml 的交互逻辑
+    /// ChartRadarExample.xaml 的交互逻辑
     /// </summary>
-    public partial class RadarChartExample : UserControl
+    public partial class ChartRadarExample : UserControl
     {
-        public ObservableCollection<RadarModel> RadarModels
+        public IEnumerable<KeyValuePair<string, double>> Datas
         {
-            get { return (ObservableCollection<RadarModel>)GetValue(RadarModelsProperty); }
-            set { SetValue(RadarModelsProperty, value); }
+            get { return (IEnumerable<KeyValuePair<string, double>>)GetValue(DatasProperty); }
+            set { SetValue(DatasProperty, value); }
         }
-        public static readonly DependencyProperty RadarModelsProperty =
-       DependencyProperty.Register("RadarModels", typeof(ObservableCollection<RadarModel>), typeof(RadarChartExample), new PropertyMetadata(null));
+
+        public static readonly DependencyProperty DatasProperty =
+            DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(ChartRadarExample), new PropertyMetadata(null));
+
         List<Player> Players = new List<Player>();
         private int NowPlayerIndex = 0;
         public string NowPlayerName
@@ -29,23 +31,22 @@ public string NowPlayerName
             set { SetValue(NowPlayerNameProperty, value); }
         }
         public static readonly DependencyProperty NowPlayerNameProperty =
-     DependencyProperty.Register("NowPlayerName", typeof(string), typeof(RadarChartExample), new PropertyMetadata(null));
+     DependencyProperty.Register("NowPlayerName", typeof(string), typeof(ChartRadarExample), new PropertyMetadata(null));
 
-        List<ObservableCollection<RadarModel>> collectionList = new List<ObservableCollection<RadarModel>>();
-        public RadarChartExample()
+        List<List<KeyValuePair<string, double>>> collectionList = new List<List<KeyValuePair<string, double>>>();
+        public ChartRadarExample()
         {
             InitializeComponent();
-            RadarModels = new ObservableCollection<RadarModel>();
             Player theShy = new Player()
             {
                 姓名 = "The Shy",
-                击杀 = 80,
-                助攻 = 50,
+                击杀 = 800,
+                助攻 = 500,
                 物理 = 90,
-                生存 = 10,
-                金钱 = 60,
-                防御 = 30,
-                魔法 = 30
+                生存 = 120,
+                金钱 = 360,
+                防御 = 230,
+                魔法 = 130
             };
             Player xiaoHu = new Player()
             {
@@ -77,7 +78,7 @@ public RadarChartExample()
                 物理 = 80,
                 生存 = 70,
                 金钱 = 80,
-                防御 = 80,
+                防御 = 100,
                 魔法 = 30
             };
             Players.AddRange(new[] { theShy, xiaoHu, yinHang, flandre });
@@ -88,14 +89,14 @@ public RadarChartExample()
 
             foreach (var player in Players)
             {
-                var collectionpPayer = new ObservableCollection<RadarModel>();
+                var collectionpPayer = new List<KeyValuePair<string, double>>();
                 Array.ForEach<PropertyInfo>(pArray, p =>
                 {
-                    collectionpPayer.Add(new RadarModel { Text = $"{p.Name}（{(int)p.GetValue(player, null)}分）", ValueMax = (int)p.GetValue(player, null) });
+                    collectionpPayer.Add(new KeyValuePair<string, double>( $"{p.Name}（{(int)p.GetValue(player, null)}分）", (int)p.GetValue(player, null)));
                 });
                 collectionList.Add(collectionpPayer);
             }
-            RadarModels = collectionList[0];
+            Datas = collectionList[0];
             NowPlayerName = Players[0].姓名;
         }
 
@@ -106,7 +107,7 @@ private void Button_Click(object sender, RoutedEventArgs e)
             {
                 NowPlayerIndex = 0;
             }
-            RadarModels = collectionList[NowPlayerIndex];
+            Datas = collectionList[NowPlayerIndex];
             NowPlayerName = Players[NowPlayerIndex].姓名;
         }
     }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
index 6ea48ee2..45552b88 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wd="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" wpfdev:ElementHelper.Watermark="请输入内容" />
+                        <TextBox x:Name="LeftInput" wd:ElementHelper.Watermark="请输入内容" />
                         <Button
                             x:Name="LeftSend"
                             Grid.Column="1"
@@ -173,7 +173,7 @@
                             <ColumnDefinition />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <TextBox x:Name="RightInput" wpfdev:ElementHelper.Watermark="请输入内容" />
+                        <TextBox x:Name="RightInput" wd: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 8eeda5c1..854f13d5 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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"/>
-        <wpfdev:CircularMenu ItemsSource="{Binding MenuArray,RelativeSource={RelativeSource AncestorType=local:CircularMenuExample}}" 
+        <wd: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 c06727a6..7b8f195d 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
         <UniformGrid>
-            <wpfdev:CircularProgressBar Background="#21BA9D"
+            <wd:CircularProgressBar Background="#21BA9D"
                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="2"
                                        StrokeThickness="3"
                                        Size="20,30"
                                        BorderBrush="LightGray"/>
 
-            <wpfdev:CircularProgressBar Background="#E14D5F" 
+            <wd:CircularProgressBar Background="#E14D5F" 
                                         Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="4"
                                        StrokeThickness="5"
                                        Size="15,15"
                                         BorderBrush="#42ABAC" />
-            <wpfdev:CircularProgressBar Background="#1FA7FC" 
+            <wd:CircularProgressBar Background="#1FA7FC" 
                                        BorderBrush="#D6D6D6" 
                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="10"
                                        StrokeThickness="10"
                                        Foreground="Black"/>
-            <wpfdev:CircularProgressBar Value="{Binding ElementName=CirularSlider,Path=Value}"/>
+            <wd: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 6161bf3f..ea8377ba 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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 94de8aea..9335491e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml
@@ -1,9 +1,9 @@
-<wpfdev:Window x:Class="WPFDevelopers.Samples.ExampleViews.CropAvatarWindow"
+<wd: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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+               xmlns:wd="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>
-        <wpfdev:CropAvatar x:Name="MyCropAvatar"/>
+        <wd: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>
-</wpfdev:Window>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml
index 1bfaad04..6a427b6b 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wd="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
new file mode 100644
index 00000000..2bf60451
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs
@@ -0,0 +1,301 @@
+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
new file mode 100644
index 00000000..f535a0f4
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs
@@ -0,0 +1,418 @@
+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
new file mode 100644
index 00000000..cbbea3a2
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs
@@ -0,0 +1,404 @@
+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
new file mode 100644
index 00000000..b5496758
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs
@@ -0,0 +1,99 @@
+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
new file mode 100644
index 00000000..cd78616a
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs
@@ -0,0 +1,242 @@
+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
new file mode 100644
index 00000000..2339ff95
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml
@@ -0,0 +1,25 @@
+<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
new file mode 100644
index 00000000..331fdcec
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000..30d01209
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 00000000..9b916976
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000..c19976d2
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml
@@ -0,0 +1,159 @@
+<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
new file mode 100644
index 00000000..d64a268d
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs
@@ -0,0 +1,229 @@
+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 d915026e..1f6c98ae 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wd="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" />
-            <wpfdev:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
-                <wpfdev:DrawerMenuItem Text="主页">
-                    <wpfdev:DrawerMenuItem.Icon>
+            <wd:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
+                <wd:DrawerMenuItem Text="主页">
+                    <wd:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/2.png" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-                <wpfdev:DrawerMenuItem Text="Edge">
-                    <wpfdev:DrawerMenuItem.Icon>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+                <wd:DrawerMenuItem Text="Edge">
+                    <wd:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/4.png" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-                <wpfdev:DrawerMenuItem Text="云盘">
-                    <wpfdev:DrawerMenuItem.Icon>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+                <wd:DrawerMenuItem Text="云盘">
+                    <wd:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/1.png" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-                <wpfdev:DrawerMenuItem Text="邮件">
-                    <wpfdev:DrawerMenuItem.Icon>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+                <wd:DrawerMenuItem Text="邮件">
+                    <wd:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/8.png" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-                <wpfdev:DrawerMenuItem Text="视频">
-                    <wpfdev:DrawerMenuItem.Icon>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+                <wd:DrawerMenuItem Text="视频">
+                    <wd:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/6.png" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-                <wpfdev:DrawerMenuItem Text="Bus">
-                    <wpfdev:DrawerMenuItem.Icon>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+                <wd:DrawerMenuItem Text="Bus">
+                    <wd:DrawerMenuItem.Icon>
                         <Path
                             Width="20"
                             Height="20"
                             Data="{StaticResource WD.BusGeometry}"
                             Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
                             Stretch="Uniform" />
-                    </wpfdev:DrawerMenuItem.Icon>
-                </wpfdev:DrawerMenuItem>
-            </wpfdev:DrawerMenu>
+                    </wd:DrawerMenuItem.Icon>
+                </wd:DrawerMenuItem>
+            </wd:DrawerMenu>
 
         </Grid>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml
index a3464394..4652f2a8 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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">
-            <wpfdev:EdgeLight IsAnimation="{Binding ElementName=myCheckBox,Path=IsChecked}" Margin="10" LineSize="2">
+            <wd:EdgeLight IsAnimation="{Binding ElementName=myCheckBox,Path=IsChecked}" Margin="10" LineSize="2">
                 <CheckBox Content="EdgeLight" x:Name="myCheckBox"/>
-            </wpfdev:EdgeLight>
-            <wpfdev:EdgeLight IsAnimation="{Binding ElementName=myToggleButton,Path=IsChecked}" Margin="10" 
+            </wd:EdgeLight>
+            <wd:EdgeLight IsAnimation="{Binding ElementName=myToggleButton,Path=IsChecked}" Margin="10" 
                               BorderBrush="OrangeRed" LineSize="4">
                 <ToggleButton Content="EdgeLight2" x:Name="myToggleButton"/>
-            </wpfdev:EdgeLight>
+            </wd: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 48853072..325a96a8 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:BallLoading Width="200"/>
+        <wd: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 130d7e9c..2f7664b8 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:CycleLoading  Value="50" LoadTitle="Loading...." Width="200">
+        <wd:CycleLoading  Value="50" LoadTitle="Loading...." Width="200">
             <TextBlock Text="activity"/>
-        </wpfdev:CycleLoading>
+        </wd: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 fa4612ec..14f07466 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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>
-        <wpfdev:RingLoading IsStart="true" 
+        <wd: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 fbdc7386..ac2df61c 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:RollLoading IsStart="true" 
+        <wd:RollLoading IsStart="true" 
                             HorizontalContentAlignment="Center" 
                             VerticalContentAlignment="Center"
                             Width="200">
             <TextBlock Text="Loading activity..."/>
-        </wpfdev:RollLoading>
+        </wd: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 898e65b7..e62bfa6f 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:StreamerLoading>
-            <wpfdev:StreamerLoading.Background>
+        <wd:StreamerLoading>
+            <wd:StreamerLoading.Background>
                 <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}"/>
-            </wpfdev:StreamerLoading.Background>
-        </wpfdev:StreamerLoading>
+            </wd:StreamerLoading.Background>
+        </wd: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 6661a0d2..38daba47 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wpfdev:WaitLoading/>
+        <wd: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 2d7e68d5..b5aaca2c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
@@ -49,8 +49,17 @@
                         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 5461ae43..c2b3a416 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs
@@ -1,4 +1,9 @@
-using System.Windows.Controls;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
@@ -11,5 +16,28 @@ 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 f9222e9a..d671426d 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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"
-                   wpfdev:Magnifier.Add="{x:Static wpfdev:Magnifier.Default}"/>
+                   wd:Magnifier.Add="{x:Static wd: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 d04e7ee8..da86b6c0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
@@ -3,6 +3,7 @@
     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"
@@ -63,18 +64,34 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Border
-                Margin="0,0,5,0"
-                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
-                Effect="{StaticResource WD.NormalShadowDepth}">
-                <wd:NavigateMenu x:Name="NavigateMenu" ItemsSource="{Binding NavigateMenuModelList}">
+            <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}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="SelectionChanged">
                             <i:InvokeCommandAction Command="{Binding MenuSelectionChangedCommand}" CommandParameter="{Binding ElementName=NavigateMenu, Path=SelectedItem}" />
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
-                </wd:NavigateMenu>
-            </Border>
+                </controls:NavigateMenu>
+            </Grid>
             <GridSplitter
                 Grid.Column="1"
                 Width="5"
@@ -84,8 +101,7 @@
             <Border
                 Grid.Column="2"
                 Margin="5,0,0,0"
-                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
-                Effect="{StaticResource WD.NormalShadowDepth}">
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}">
                 <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 830c077e..ee2f2731 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -42,27 +42,25 @@
             <ListBox
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="20,0,0,0"
+                Margin="0,0,0,10"
                 ItemsSource="{Binding NormalPaginationViewModel.PaginationCollection}" />
             <ListBox
                 Grid.Row="1"
                 Grid.Column="2"
-                Margin="0,0,20,0"
+                Margin="0,0,0,10"
                 ItemsSource="{Binding LitePaginationViewModel.PaginationCollection}" />
 
-            <wpfdev:Pagination
+            <wd: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" />
 
-            <wpfdev:Pagination
+            <wd: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/RulerControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
index 24b0fcd0..b9552223 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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}" />
-                    <wpfdev:Ruler x:Name="PART_Ruler" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wd: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}" />
-                    <wpfdev:Ruler x:Name="PART_Ruler1" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wd: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}" />
-                    <wpfdev:Ruler x:Name="PART_Ruler2" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wd: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 32e60cc4..cc8498ac 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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>
-        <wpfdev:SixGirdView BorderThickness="1" SelectBrush="Red">
-            <wpfdev:SixGirdView.Resources>
+        <wd:SixGirdView BorderThickness="1" SelectBrush="Red">
+            <wd: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>
-            </wpfdev:SixGirdView.Resources>
+            </wd:SixGirdView.Resources>
             <MediaElement x:Name="MyMediaElement" Loaded="MyMediaElement_Loaded"
                           MediaEnded="MyMediaElement_MediaEnded"/>
             <Border Background="#282C34">
-                <wpfdev:SmallPanel>
+                <wd:SmallPanel>
                     <TextBlock Text="信号源1"/>
                     <Border Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             VerticalAlignment="Top"
@@ -32,7 +32,7 @@
                             CornerRadius="3">
                         <TextBlock Text="HD"/>
                     </Border>
-                </wpfdev:SmallPanel>
+                </wd:SmallPanel>
             </Border>
             <Border Background="#282C34">
                 <TextBlock Text="无信号"/>
@@ -46,7 +46,7 @@
             <Border Background="#282C34">
                 <TextBlock Text="无信号"/>
             </Border>
-        </wpfdev:SixGirdView>
+        </wd: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 0aff2e65..ec94c294 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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">
-            <wpfdev:SpotLight FontSize="50" Text="YanJinHua" 
+            <wd:SpotLight FontSize="50" Text="YanJinHua" 
                           DefaultForeground="Crimson" 
                           Foreground="Fuchsia" 
                           Duration="00:00:05" />
-            <wpfdev:SpotLight/>
+            <wd: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 097f5f76..b2074cc8 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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="wpfdev:ElementHelper.Watermark" Value="输入内容"></Setter>
+            <Setter Property="wd:ElementHelper.Watermark" Value="输入内容"></Setter>
             <Setter Property="Margin" Value="-30,0"></Setter>
             <Setter Property="Width" Value="100"></Setter>
         </Style>
     </UserControl.Resources>
     <controls:CodeViewer>
     <Grid>
-        <wpfdev:StarrySky Name="myStarrySky">
+        <wd:StarrySky Name="myStarrySky">
 
-        </wpfdev:StarrySky>
+        </wd: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 833bfb25..b466ff25 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml
@@ -1,11 +1,11 @@
-<wpfdev:Window
+<wd: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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     Title="TaskbarItemInfoExample"
     Width="363"
     Height="211"
@@ -50,4 +50,4 @@
             Style="{StaticResource WD.SuccessPrimaryButton}"
             Tag="remove" />
     </WrapPanel>
-</wpfdev:Window>
+</wd:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
index 443ebb76..f7e56d9b 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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}"/>
-                    <wpfdev:Thermometer x:Name="PART_Thermometer"
+                    <wd: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 5c18dbb2..68fe0be9 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:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wd="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">
-                <wpfdev:VerifyCode Foreground="LimeGreen" Name="VerifyCode1"/>
-                <wpfdev:VerifyCode Foreground="Red" Name="VerifyCode2"/>
-                <wpfdev:VerifyCode Foreground="DodgerBlue" Name="VerifyCode3"/>
-                <wpfdev:VerifyCode Foreground="HotPink" Name="VerifyCode4"/>
+                <wd:VerifyCode Foreground="LimeGreen" Name="VerifyCode1"/>
+                <wd:VerifyCode Foreground="Red" Name="VerifyCode2"/>
+                <wd:VerifyCode Foreground="DodgerBlue" Name="VerifyCode3"/>
+                <wd: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 a05067e1..e9b21987 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,
-        RadarChart,
-        BasicBarChart,
+        ChartRadar,
+        ChartBar,
         ZooSemy,
         RulerControl,
         RainbowBtn,
@@ -80,6 +80,8 @@ 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 6ded4048..eaa3dae6 100644
--- a/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs
+++ b/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs
@@ -1,7 +1,17 @@
 namespace WPFDevelopers.Samples.Models
 {
-    public class NavigateMenuModel
+    public class NavigateMenuModel:ViewModelBase
     {
+        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 00ff9811..d873cb5b 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -1,5 +1,8 @@
-using System;
+using Microsoft.Expression.Drawing.Core;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -18,11 +21,11 @@
 
 namespace WPFDevelopers.Samples.ViewModels
 {
-    public class MainVM:ViewModelBase
+    public class MainVM : ViewModelBase
     {
-        private ObservableCollection<ListBoxItem> _navigateMenuModelList;
+        private IList<NavigateMenuModel> _navigateMenuModelList;
 
-        public ObservableCollection<ListBoxItem> NavigateMenuModelList
+        public IList<NavigateMenuModel> NavigateMenuModelList
         {
             get { return _navigateMenuModelList; }
             set { _navigateMenuModelList = value; }
@@ -38,7 +41,7 @@ public NavigateMenuModel NavigateMenuItem
             set
             {
                 _navigateMenuItem = value;
-                this.NotifyPropertyChange("NavigateMenuItem");
+                NotifyPropertyChange("NavigateMenuItem");
             }
         }
         private object _controlPanel;
@@ -51,32 +54,54 @@ public object ControlPanel
             set
             {
                 _controlPanel = value;
-                this.NotifyPropertyChange("ControlPanel");
+                NotifyPropertyChange("ControlPanel");
             }
         }
         public MainVM()
         {
-            NavigateMenuModelList = new ObservableCollection<ListBoxItem>();
+            NavigateMenuModelList = new ObservableCollection<NavigateMenuModel>();
             foreach (MenuEnum menuEnum in Enum.GetValues(typeof(MenuEnum)))
             {
-                NavigateMenuModelList.Add(new ListBoxItem { Content = menuEnum.ToString() });
+                NavigateMenuModelList.Add(new NavigateMenuModel { Name = menuEnum.ToString() });
             }
-            NavigateMenuModelList.Add(new ListBoxItem { Content = "持续更新中" });
+            NavigateMenuModelList.Add(new NavigateMenuModel { Name = "持续更新中" });
             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 ListBoxItem;
-            MenuItemSelection(model.Content.ToString());
+            var model = obj as NavigateMenuModel;
+            MenuItemSelection(model.Name);
         });
 
-        public ICommand CloseCommand => new RelayCommand( obj => 
+        public ICommand CloseCommand => new RelayCommand(obj =>
         {
             Application.Current.MainWindow.Close();
         });
@@ -87,7 +112,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:
@@ -138,7 +163,7 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.BreatheLight:
                     ControlPanel = new BreatheLightExample();
                     break;
-               
+
                 case MenuEnum.ChatEmoji:
                     ControlPanel = new ChatEmojiExample();
                     break;
@@ -184,8 +209,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.DrawerMenu:
                     ControlPanel = new DrawerMenuExample();
                     break;
-                case MenuEnum.RadarChart:
-                    ControlPanel = new RadarChartExample();
+                case MenuEnum.ChartRadar:
+                    ControlPanel = new ChartRadarExample();
                     break;
                 case MenuEnum.LoginWindow:
                     ControlPanel = new LoginExample();
@@ -195,8 +220,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Pagination:
                     ControlPanel = new PaginationExample();
                     break;
-                case MenuEnum.BasicBarChart:
-                    ControlPanel = new BasicBarChartExample();
+                case MenuEnum.ChartBar:
+                    ControlPanel = new ChartBarExample();
                     break;
                 case MenuEnum.ZooSemy:
                     ControlPanel = new ZooSemyExample();
@@ -318,6 +343,12 @@ 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();
@@ -339,5 +370,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 86ad8dcf..798e7ea1 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -25,6 +25,7 @@
     <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" />
@@ -69,9 +70,9 @@
       <SubType>Code</SubType>
       <DependentUpon>BarrageExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BasicBarChartExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartBarExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>BasicBarChartExample.xaml</DependentUpon>
+      <DependentUpon>ChartBarExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BasicControlsExample.xaml.cs">
       <SubType>Code</SubType>
@@ -103,6 +104,9 @@
       <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>
@@ -154,6 +158,17 @@
       <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>
@@ -318,9 +333,9 @@
       <SubType>Code</SubType>
       <DependentUpon>PieControlExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\RadarChartExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartRadarExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>RadarChartExample.xaml</DependentUpon>
+      <DependentUpon>ChartRadarExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\RainbowButtonsExample.xaml.cs">
       <SubType>Code</SubType>
@@ -473,6 +488,10 @@
       <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>
@@ -529,7 +548,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\BasicBarChartExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartBarExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -561,6 +580,10 @@
       <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>
@@ -613,6 +636,14 @@
       <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>
@@ -798,7 +829,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\RadarChartExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartRadarExample.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 6b43b722..c891665f 100644
--- a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
+++ b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
@@ -11,9 +11,7 @@
 		</BootstrapperPackage>
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview6" />
-	</ItemGroup>
-	<ItemGroup>
+		<ProjectReference Include="..\WPFDevelopers.Net40\WPFDevelopers.Net40.csproj" />
 		<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 8077602b..161ae3e3 100644
--- a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
+++ b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
@@ -2,9 +2,7 @@
 	<Import Project="../Resources.props" />
 	<Import Project="../TargetFrameworks.props" />
 	<ItemGroup>
-	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview6" />
-	</ItemGroup>
-	<ItemGroup>
+		<ProjectReference Include="..\WPFDevelopers.Net45x\WPFDevelopers.Net45x.csproj" />
 		<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 85717037..94a94a89 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\BasicBarChartExample.xaml.cs" Link="ExampleViews\BasicBarChartExample.xaml.cs" DependentUpon="BasicBarChartExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartBarExample.xaml.cs" Link="ExampleViews\ChartBarExample.xaml.cs" DependentUpon="ChartBarExample.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\RadarChartExample.xaml.cs" Link="ExampleViews\RadarChartExample.xaml.cs" DependentUpon="RadarChartExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartRadarExample.xaml.cs" Link="ExampleViews\ChartRadarExample.xaml.cs" DependentUpon="ChartRadarExample.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,6 +143,7 @@
 		<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">
@@ -160,8 +161,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BarrageExample.xaml">
 			<Link>ExampleViews\BarrageExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicBarChartExample.xaml">
-			<Link>ExampleViews\BasicBarChartExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartBarExample.xaml">
+			<Link>ExampleViews\ChartBarExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicControlsExample.xaml">
 			<Link>ExampleViews\BasicControlsExample.xaml</Link>
@@ -316,8 +317,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PieControlExample.xaml">
 			<Link>ExampleViews\PieControlExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RadarChartExample.xaml">
-			<Link>ExampleViews\RadarChartExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartRadarExample.xaml">
+			<Link>ExampleViews\ChartRadarExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RainbowButtonsExample.xaml">
 			<Link>ExampleViews\RainbowButtonsExample.xaml</Link>
@@ -484,5 +485,8 @@
 		<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 48ce751c..9a60824f 100644
--- a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
+++ b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
@@ -3,29 +3,20 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class AnimationNavigationBar3D : ItemsControl
+    public class AnimationNavigationBar3D : ListBox
     {
-        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)));
         }
-
-
-        public int Columns
+        protected override bool IsItemItsOwnContainerOverride(object item)
         {
-            get => (int)GetValue(ColumnsProperty);
-            set => SetValue(ColumnsProperty, value);
+            return item is AnimationNavigationBar3DItem;
         }
-
-        public override void OnApplyTemplate()
+        protected override DependencyObject GetContainerForItemOverride()
         {
-            base.OnApplyTemplate();
-            Columns = Items.Count;
+            return new AnimationNavigationBar3DItem();
         }
     }
 }
\ 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 d717cbad..dd1444d0 100644
--- a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs
+++ b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs
@@ -1,69 +1,49 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
-    public class AnimationNavigationBar3DItem : Control
+    public class AnimationNavigationBar3DItem : ListBoxItem
     {
-        public static readonly DependencyProperty FileBackgroundProperty =
-            DependencyProperty.Register("FileBackground", typeof(Brush), typeof(AnimationNavigationBar3DItem),
+        public static readonly DependencyProperty FillProperty =
+            DependencyProperty.Register("Fill", typeof(Brush), typeof(AnimationNavigationBar3DItem),
                 new PropertyMetadata(null));
 
-        public static readonly DependencyProperty BackFileBackgroundProperty =
-            DependencyProperty.Register("BackFileBackground", typeof(Brush), typeof(AnimationNavigationBar3DItem),
+        public static readonly DependencyProperty ContentBackProperty =
+            DependencyProperty.Register("ContentBack", typeof(object), 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)));
         }
 
-        /// <summary>
-        ///     默认颜色
-        /// </summary>
-        public Brush FileBackground
+        public override void OnApplyTemplate()
         {
-            get => (Brush)GetValue(FileBackgroundProperty);
-            set => SetValue(FileBackgroundProperty, value);
+            base.OnApplyTemplate();
+            if (ContentBack == null) 
+                ContentBack = ControlsHelper.GetXmlReader(Content);
         }
 
         /// <summary>
-        ///     背面颜色
+        ///  Color fore
         /// </summary>
-        public Brush BackFileBackground
+        public Brush Fill
         {
-            get => (Brush)GetValue(BackFileBackgroundProperty);
-            set => SetValue(BackFileBackgroundProperty, value);
+            get => (Brush)GetValue(FillProperty);
+            set => SetValue(FillProperty, 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 string Text
+        public object ContentBack
         {
-            get => (string)GetValue(TextProperty);
-            set => SetValue(TextProperty, value);
+            get => (object)GetValue(ContentBackProperty);
+            set => SetValue(ContentBackProperty, 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
new file mode 100644
index 00000000..fd744614
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 00000000..f1aeb116
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
@@ -0,0 +1,56 @@
+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
deleted file mode 100644
index cac5be86..00000000
--- a/src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-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
new file mode 100644
index 00000000..dc764aec
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
@@ -0,0 +1,32 @@
+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
new file mode 100644
index 00000000..cc3bfb86
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
@@ -0,0 +1,150 @@
+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
new file mode 100644
index 00000000..21302a93
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
@@ -0,0 +1,77 @@
+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/RadarChart/RadarChart.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
similarity index 50%
rename from src/WPFDevelopers.Shared/Controls/RadarChart/RadarChart.cs
rename to src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
index c197dc4d..1ec8d4fd 100644
--- a/src/WPFDevelopers.Shared/Controls/RadarChart/RadarChart.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
@@ -1,119 +1,118 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
-    public class RadarChart : Control
+    public class ChartRadar : ChartBase
     {
-
-        public static readonly DependencyProperty RadarArrayProperty =
-            DependencyProperty.Register("RadarArray", typeof(ObservableCollection<RadarModel>), typeof(RadarChart),
-                new UIPropertyMetadata(OnRadarArrayChanged));
-
-        static RadarChart()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(RadarChart),
-                new FrameworkPropertyMetadata(typeof(RadarChart)));
-        }
-
-        public ObservableCollection<RadarModel> RadarArray
-        {
-            get => (ObservableCollection<RadarModel>)GetValue(RadarArrayProperty);
-            set => SetValue(RadarArrayProperty, value);
-        }
-
-        private static void OnRadarArrayChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        private PointCollection _points;
+        private double _h, _w;
+        private Pen _penXAxis;
+        static ChartRadar()
         {
-            var radarChart = d as RadarChart;
-            if (e.NewValue != null)
-                radarChart.InvalidateVisual();
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(ChartRadar),
+                new FrameworkPropertyMetadata(typeof(ChartRadar)));
         }
-
         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);
+            base.OnRender(drawingContext);
+            _penXAxis = new Pen
+            {
+                Thickness = 1,
+                Brush = Application.Current.TryFindResource("WD.ChartXAxisSolidColorBrush") as Brush
+            };
+            _penXAxis.Freeze();
+
+            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;
+            }
 
             var myPen = new Pen
             {
-                Thickness = 4,
-                Brush = ControlsHelper.PrimaryNormalBrush
+                Thickness = 3,
+                Brush = NormalBrush
             };
             myPen.Freeze();
+
             var streamGeometry = new StreamGeometry();
             using (var geometryContext = streamGeometry.Open())
             {
-                var h = ActualHeight / 2;
-                var w = ActualWidth / 2;
                 var points = new PointCollection();
-                foreach (var item in RadarArray)
+                short index = 0;
+                foreach (var item in Datas)
                 {
-                    var model = new Point((item.PointValue.X - w) / 100 * item.ValueMax + w,
-                        (item.PointValue.Y - h) / 100 * item.ValueMax + h);
-                    points.Add(model);
+                    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++;
                 }
-
                 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(int circleRadius, DrawingContext drawingContext, bool isDrawText = false)
+        private void DrawPoints(double circleRadius, DrawingContext drawingContext, bool isDrawText = false)
         {
-            var myPen = new Pen
-            {
-                Thickness = 2,
-                Brush = Brushes.Gainsboro
-            };
-            myPen.Freeze();
+            var pieWidth = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
+            var pieHeight = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
+            _h = pieWidth / 2;
+            _w = pieHeight / 2;
             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, RadarArray.Count, drawingContext);
+                    _points = GetPolygonPoint(new Point(_w, _h), circleRadius, drawingContext);
                 else
-                    points = GetPolygonPoint(new Point(w, h), circleRadius, RadarArray.Count);
-                geometryContext.BeginFigure(points[points.Count - 1], true, true);
-                geometryContext.PolyLineTo(points, true, true);
+                    _points = GetPolygonPoint(new Point(_w, _h), circleRadius);
+                geometryContext.BeginFigure(_points[_points.Count - 1], true, true);
+                geometryContext.PolyLineTo(_points, true, true);
             }
-
             streamGeometry.Freeze();
-            drawingContext.DrawGeometry(null, myPen, streamGeometry);
+            drawingContext.DrawGeometry(null, _penXAxis, streamGeometry);
         }
 
-        private PointCollection GetPolygonPoint(Point center, double r, int polygonBound,
+        private PointCollection GetPolygonPoint(Point center, double r,
             DrawingContext drawingContext = null)
         {
             double g = 18;
-            double perangle = 360 / polygonBound;
+            double perangle = 360 / Datas.Count();
             var pi = Math.PI;
             var values = new List<Point>();
-            for (var i = 0; i < polygonBound; i++)
+            foreach (var item in Datas)
             {
+                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)
                 {
-                    var formattedText = DrawingContextHelper.GetFormattedText(RadarArray[i].Text, ControlsHelper.PrimaryNormalBrush,
+                    drawingContext.DrawLine(_penXAxis, p1, p2);
+                    var formattedText = DrawingContextHelper.GetFormattedText(item.Key, 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));
@@ -128,11 +127,9 @@ private PointCollection GetPolygonPoint(Point center, double r, int polygonBound
                     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/Charts/ChartRect.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
new file mode 100644
index 00000000..bc61817d
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
@@ -0,0 +1,83 @@
+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
new file mode 100644
index 00000000..88342af5
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs
@@ -0,0 +1,10 @@
+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 27e32570..a45c3fd4 100644
--- a/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs
+++ b/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs
@@ -147,11 +147,8 @@ public override void OnApplyTemplate()
         private void DrawImage()
         {
             if (Source == null) return;
-            if (_border.Visibility == Visibility.Visible)
-            {
-                _border.Visibility = Visibility.Collapsed;
+            if (_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
new file mode 100644
index 00000000..b4b42657
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs
@@ -0,0 +1,32 @@
+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 1c2d3212..64354120 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 WPFMessageBox(messageBoxText);
+            var msg = new WDMessageBox(messageBoxText);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, Window owner = null)
         {
-            var msg = new WPFMessageBox(messageBoxText, caption);
+            var msg = new WDMessageBox(messageBoxText, caption);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, Window owner = null)
         {
-            var msg = new WPFMessageBox(messageBoxText, caption, button);
+            var msg = new WDMessageBox(messageBoxText, caption, button);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon, Window owner = null)
         {
-            var msg = new WPFMessageBox(messageBoxText, caption, icon);
+            var msg = new WDMessageBox(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 WPFMessageBox(messageBoxText, caption, button, icon);
+            var msg = new WDMessageBox(messageBoxText, caption, button, icon);
             return GetWindow(msg, owner);
         }
 
-        private static MessageBoxResult GetWindow(WPFMessageBox msg, Window owner = null)
+        private static MessageBoxResult GetWindow(WDMessageBox msg, Window owner = null)
         {
             msg.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             if (owner != null)
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
similarity index 74%
rename from src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
rename to src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
index 0cb1e911..eaa52f7f 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
@@ -16,21 +16,29 @@ 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 WPFMessageBox : Window
+    internal sealed class WDMessageBox : 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;
@@ -41,37 +49,37 @@ internal sealed class WPFMessageBox : Window
         private TextBlock _title;
 
 
-        static WPFMessageBox()
+        static WDMessageBox()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(WPFMessageBox),
-                new FrameworkPropertyMetadata(typeof(WPFMessageBox)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(WDMessageBox),
+                new FrameworkPropertyMetadata(typeof(WDMessageBox)));
         }
 
-        public WPFMessageBox(string message)
+        public WDMessageBox(string message)
         {
             _messageString = message;
         }
 
-        public WPFMessageBox(string message, string caption)
+        public WDMessageBox(string message, string caption)
         {
             _titleString = caption;
             _messageString = message;
         }
 
-        public WPFMessageBox(string message, string caption, MessageBoxButton button)
+        public WDMessageBox(string message, string caption, MessageBoxButton button)
         {
             _titleString = caption;
             _messageString = message;
         }
 
-        public WPFMessageBox(string message, string caption, MessageBoxImage image)
+        public WDMessageBox(string message, string caption, MessageBoxImage image)
         {
             _titleString = caption;
             _messageString = message;
             DisplayImage(image);
         }
 
-        public WPFMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image)
+        public WDMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image)
         {
             _titleString = caption;
             _messageString = message;
@@ -117,6 +125,19 @@ 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);
@@ -143,6 +164,18 @@ 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;
@@ -165,10 +198,18 @@ private void DisplayButtons(MessageBoxButton button)
             switch (button)
             {
                 case MessageBoxButton.OKCancel:
-                case MessageBoxButton.YesNo:
                     _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;
+                    break;
                 default:
                     _okVisibility = Visibility.Visible;
                     break;
diff --git a/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs b/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
index 4bab85a8..de9104a6 100644
--- a/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
+++ b/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
@@ -272,7 +272,10 @@ private void UnsubscribeEvents()
                 _jumpPageNumericBox.ValueChanged -= OnJumpPageTextBoxChanged;
 
             if (_listBox != null)
+            {
+                _listBox.PreviewMouseMove -= ListBox_PreviewMouseMove;
                 _listBox.SelectionChanged -= OnSelectionChanged;
+            }
         }
 
         private void SubscribeEvents()
@@ -284,7 +287,15 @@ 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/RadarChart/RadarModel.cs b/src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
deleted file mode 100644
index 23e59835..00000000
--- a/src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-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 cd3966aa..543ff78e 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
@@ -9,8 +9,7 @@ namespace WPFDevelopers.Controls
 {
     public class ScreenCaptureExt : Window
     {
-        const int WM_USER = 0x03FC;
-        const int MY_MESSAGE = WM_USER + 1;
+        
         /// <summary>
         /// 截图完成委托
         /// </summary>
@@ -53,11 +52,11 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         {
             switch (msg)
             {
-                case WM_USER:
+                case Helper.WM_USER:
                     GetClipboard();
                     Close();
                     break;
-                case MY_MESSAGE:
+                case Helper.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
new file mode 100644
index 00000000..aff165bc
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 00000000..cca9f677
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs
@@ -0,0 +1,21 @@
+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 524012af..601604c4 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
@@ -8,9 +8,11 @@
 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
 {
@@ -215,6 +217,24 @@ 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 78192910..d257ee26 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
@@ -1,4 +1,6 @@
-using System.Windows;
+using System;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Helpers
 {
@@ -20,6 +22,10 @@ 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);
@@ -58,5 +64,41 @@ 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
new file mode 100644
index 00000000..3e60c28f
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs
@@ -0,0 +1,156 @@
+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 94aaa148..9f14935a 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
@@ -11,11 +11,8 @@ namespace WPFDevelopers
 {
     public class Helper
     {
-        //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 const int WM_USER = 0x03FC;
+        public const int MY_MESSAGE = WM_USER + 1;
         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 4c7030b7..a2fa2d72 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,6 +46,12 @@ 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
new file mode 100644
index 00000000..a14e863a
--- /dev/null
+++ b/src/WPFDevelopers.Shared/LanguageManager.cs
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 00000000..c594edf2
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Languages/Language.Designer.cs
@@ -0,0 +1,111 @@
+
+
+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
new file mode 100644
index 00000000..4a9658df
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
@@ -0,0 +1,186 @@
+<?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
new file mode 100644
index 00000000..075244c7
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
@@ -0,0 +1,186 @@
+<?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
new file mode 100644
index 00000000..2c8474ab
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Languages/Language.resx
@@ -0,0 +1,166 @@
+<?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 04e107c6..fe78678d 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
@@ -3,6 +3,7 @@
     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" />
@@ -38,14 +39,6 @@
                                 <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">
@@ -62,7 +55,7 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type DataGrid}">
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1,1,1,0" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -75,22 +68,32 @@
         <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}">
-                    <Border
+                    <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" Focusable="False">
+                        <ScrollViewer
+                            x:Name="DG_ScrollViewer"
+                            Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
+                            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" />
@@ -98,6 +101,7 @@
                                             <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"
@@ -141,13 +145,7 @@
                             </ScrollViewer.Template>
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Disabled" />
-                                <VisualState x:Name="Normal" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Border>
+                    </controls:WDBorder>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -320,7 +318,12 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
                     <controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
+                        <Border
+                            x:Name="DGR_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -341,26 +344,6 @@
                             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>
@@ -423,11 +406,12 @@
                     </ControlTemplate.Resources>
                     <controls:SmallPanel>
                         <Border
-                            x:Name="columnHeaderBorder"
+                            x:Name="DGR_Border"
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            SnapsToDevicePixels="True">
                             <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 d6dba6cc..d10a6ad1 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 TemplatedParent}}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}"
                             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 acc3832c..bd248956 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml
@@ -16,31 +16,43 @@
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
-                    <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                    <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">
                         <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="{DynamicResource WD.BaseSolidColorBrush}"
-                                                        BorderThickness="1">
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -97,6 +109,11 @@
                                                             </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>
@@ -105,8 +122,6 @@
                             </ToggleButton>
                             <Border
                                 x:Name="PART_Content"
-                                BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
-                                BorderThickness="0"
                                 DockPanel.Dock="Bottom"
                                 RenderTransformOrigin=".5,0"
                                 SnapsToDevicePixels="True"
@@ -130,6 +145,8 @@
                     <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" />
@@ -143,14 +160,16 @@
                             <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="{DynamicResource WD.BaseSolidColorBrush}"
-                                                        BorderThickness="1">
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -214,6 +233,11 @@
                                                             </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>
@@ -228,14 +252,16 @@
                             <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="{DynamicResource WD.BaseSolidColorBrush}"
-                                                        BorderThickness="1">
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -294,6 +320,11 @@
                                                             </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>
@@ -313,14 +344,16 @@
                             <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="{DynamicResource WD.BaseSolidColorBrush}"
-                                                        BorderThickness="1">
+                                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -384,6 +417,11 @@
                                                             </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>
@@ -397,6 +435,7 @@
                                 <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>
@@ -418,6 +457,7 @@
                                 <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>
@@ -439,6 +479,7 @@
                                 <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>
@@ -460,6 +501,7 @@
                                 <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 49ea28d7..00b3390d 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
@@ -1,6 +1,7 @@
 <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" />
@@ -13,19 +14,21 @@
         <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>
+                    <Grid Margin="{TemplateBinding Margin}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Border
-                            Grid.Row="0"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="1">
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}"
+                            SnapsToDevicePixels="True">
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
                                 VerticalAlignment="Center"
@@ -36,6 +39,7 @@
                             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 26e052b3..b67c43cf 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
@@ -2,6 +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:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
@@ -16,20 +17,24 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="0,1,0,0" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
-                    <Border
-                        Name="Border"
+                    <controls:WDBorder
+                        x:Name="Border"
+                        Margin="{TemplateBinding Margin}"
+                        Padding="0,0,0,.1"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <ScrollViewer Focusable="False">
+                        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">
                             <VirtualizingStackPanel IsItemsHost="True" />
                         </ScrollViewer>
-                    </Border>
+                    </controls:WDBorder>
                     <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 59d6e46c..4051d220 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml
@@ -2,6 +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:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
@@ -16,12 +17,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <Grid Background="{TemplateBinding Background}">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="*" />
-                            <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-
+                    <controls:SmallPanel>
                         <DockPanel Margin="{TemplateBinding Padding}">
                             <ScrollViewer
                                 DockPanel.Dock="Top"
@@ -38,7 +34,6 @@
                                     Columns="{Binding Path=TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </ScrollViewer>
-
                             <ScrollContentPresenter
                                 Name="PART_ScrollContentPresenter"
                                 CanContentScroll="True"
@@ -46,10 +41,9 @@
                                 CanVerticallyScroll="False"
                                 KeyboardNavigation.DirectionalNavigation="Local" />
                         </DockPanel>
-
                         <ScrollBar
                             Name="PART_HorizontalScrollBar"
-                            Grid.Row="1"
+                            VerticalAlignment="Bottom"
                             Maximum="{TemplateBinding ScrollableWidth}"
                             Orientation="Horizontal"
                             ViewportSize="{TemplateBinding ViewportWidth}"
@@ -62,8 +56,7 @@
                             ViewportSize="{TemplateBinding ViewportHeight}"
                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
                             Value="{TemplateBinding VerticalOffset}" />
-
-                    </Grid>
+                    </controls:SmallPanel>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -162,8 +155,26 @@
                         Name="Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
                         <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 cc127e55..c46fba45 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
@@ -78,9 +78,8 @@
                             CornerRadius="0,0,3,3"
                             Effect="{StaticResource WD.PopupShadowDepth}"
                             SnapsToDevicePixels="True">
-
                             <ScrollViewer Margin="0,4" CanContentScroll="True">
-                                <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                                <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                             </ScrollViewer>
                         </Border>
                         <Border
@@ -260,11 +259,11 @@
                         Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                         BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
                         BorderThickness="1"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        CornerRadius="0,0,3,3"
                         Effect="{StaticResource WD.PopupShadowDepth}"
                         SnapsToDevicePixels="True">
                         <ScrollViewer Margin="0,4" CanContentScroll="True">
-                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                            <VirtualizingStackPanel 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 110c217b..7ffeee25 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:sys="clr-namespace:System;assembly=mscorlib">
+    xmlns:resx="clr-namespace:WPFDevelopers">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
+    <Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
         <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:WPFMessageBox}">
+                <ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
                     <Border
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
@@ -47,7 +47,8 @@
                                         Margin="0,6"
                                         HorizontalAlignment="Right"
                                         IsTabStop="False"
-                                        Style="{DynamicResource WD.WindowButtonStyle}">
+                                        Style="{DynamicResource WD.WindowButtonStyle}"
+                                        ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
                                         <Path
                                             Width="10"
                                             Height="10"
@@ -81,19 +82,35 @@
                                         TextWrapping="Wrap" />
                                 </DockPanel>
                             </controls:SmallPanel>
-                            <controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
+                            <controls:SmallPanel
+                                Grid.Row="2"
+                                Margin="140,20,10,10"
+                                HorizontalAlignment="Right">
                                 <UniformGrid Height="38" Rows="1">
                                     <Button
-                                        x:Name="PART_ButtonCancel"
+                                        x:Name="PART_ButtonYes"
                                         Width="60"
-                                        Content="取消"
+                                        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="确认"
+                                        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" />
                                 </UniformGrid>
                             </controls:SmallPanel>
                         </Grid>
@@ -102,5 +119,5 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
+    <Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
 </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 ecacf83e..01758842 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:sys="clr-namespace:System;assembly=mscorlib">
+    xmlns:resx="clr-namespace:WPFDevelopers">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
@@ -49,6 +49,23 @@
                                 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>
@@ -58,6 +75,16 @@
                         <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 27432e2f..9dbb3925 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>
-                    <Border x:Name="PART_TemplateRoot">
+                    <controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
                         <controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
                             <Border
                                 x:Name="PART_Border"
                                 Background="{DynamicResource WD.BaseSolidColorBrush}"
-                                CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                                Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
                             <Rectangle x:Name="PART_Track" />
                             <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                                 <Border
                                     x:Name="Indicator"
                                     Background="{TemplateBinding Foreground}"
-                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                                    Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
                             </Decorator>
                             <Rectangle
                                 x:Name="PART_Rectangle"
@@ -59,7 +59,7 @@
                                 </Rectangle.RenderTransform>
                             </Rectangle>
                         </controls:SmallPanel>
-                    </Border>
+                    </controls:WDBorder>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Orientation" Value="Vertical">
                             <Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -75,7 +75,6 @@
                             </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>
@@ -128,7 +127,6 @@
                                 <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 43187fbe..d212016f 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml
@@ -73,17 +73,32 @@
     <Style
         x:Key="WD.SliderRepeatButtonStyle"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type RepeatButton}">
+        TargetType="{x:Type controls:SliderRepeatButton}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Rectangle
+                <ControlTemplate TargetType="{x:Type controls:SliderRepeatButton}">
+                    <Border
+                        x:Name="PART_Border"
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
-                        Fill="{TemplateBinding Background}" />
+                        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>
             </Setter.Value>
         </Setter>
@@ -123,19 +138,21 @@
 
                 <Track x:Name="PART_Track" Grid.Row="1">
                     <Track.DecreaseRepeatButton>
-                        <RepeatButton
+                        <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}" />
                     </Track.DecreaseRepeatButton>
                     <Track.IncreaseRepeatButton>
-                        <RepeatButton
+                        <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}" />
                     </Track.IncreaseRepeatButton>
                     <Track.Thumb>
@@ -192,17 +209,19 @@
                     Visibility="Collapsed" />
                 <Track x:Name="PART_Track" Grid.Column="1">
                     <Track.DecreaseRepeatButton>
-                        <RepeatButton
+                        <controls:SliderRepeatButton
                             Width="{StaticResource WD.RepeatButtonSize}"
                             Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             Command="{x:Static Slider.DecreaseLarge}"
+                            RadiusOrientation="Up"
                             Style="{StaticResource WD.SliderRepeatButtonStyle}" />
                     </Track.DecreaseRepeatButton>
                     <Track.IncreaseRepeatButton>
-                        <RepeatButton
+                        <controls:SliderRepeatButton
                             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 909859fc..25873218 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -1,7 +1,8 @@
 <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:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -47,11 +48,6 @@
                                     </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>
@@ -112,11 +108,6 @@
                                     </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>
@@ -168,19 +159,18 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="2" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
-                    <Border
+                    <controls:WDBorder
+                        x:Name="PART_Border"
                         Margin="{TemplateBinding Margin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid
-                            ClipToBounds="True"
-                            KeyboardNavigation.TabNavigation="Local"
-                            SnapsToDevicePixels="True">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <Grid Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Name="ColumnDefinition0" />
                                 <ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -194,10 +184,12 @@
                                 Grid.Row="0"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="0,0,0,1">
+                                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"
-                                    Margin="2,2,2,0"
                                     Panel.ZIndex="1"
                                     IsItemsHost="True"
                                     KeyboardNavigation.TabIndex="1" />
@@ -219,7 +211,7 @@
                                     SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
                             </controls:SmallPanel>
                         </Grid>
-                    </Border>
+                    </controls:WDBorder>
                     <ControlTemplate.Triggers>
                         <Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
                             <Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -227,6 +219,7 @@
                             <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">
@@ -237,6 +230,7 @@
                             <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">
@@ -248,6 +242,7 @@
                             <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 ce8c4334..e944f4e4 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:sys="clr-namespace:System;assembly=mscorlib">
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -44,6 +44,23 @@
                                 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>
@@ -56,6 +73,23 @@
                         <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 2ac94bcc..14492274 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
@@ -21,17 +21,20 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
-                    <Border
+                    <controls:WDBorder
+                        Padding="{TemplateBinding Padding}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}">
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
                         <ScrollViewer
-                            Padding="{TemplateBinding Padding}"
                             CanContentScroll="False"
+                            Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
                             Focusable="False">
                             <ItemsPresenter />
                         </ScrollViewer>
-                    </Border>
+                    </controls:WDBorder>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml b/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
index a18d9c66..4c167ce2 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
@@ -12,6 +12,9 @@
         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}">
@@ -47,7 +50,7 @@
                         <Viewport3D.Children>
                             <ModelVisual3D>
                                 <ModelVisual3D.Content>
-                                    <AmbientLight Color="{DynamicResource BackgroundColor}" />
+                                    <AmbientLight Color="{DynamicResource WD.BackgroundColor}" />
                                 </ModelVisual3D.Content>
                             </ModelVisual3D>
                             <ContainerUIElement3D>
@@ -61,7 +64,6 @@
                                         </RotateTransform3D.Rotation>
                                     </RotateTransform3D>
                                 </ContainerUIElement3D.Transform>
-
                                 <Viewport2DVisual3D>
                                     <Viewport2DVisual3D.Material>
                                         <DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
@@ -75,14 +77,14 @@
                                     <Border
                                         Width="110"
                                         Height="110"
-                                        Background="{TemplateBinding FileBackground}"
+                                        Background="{TemplateBinding Background}"
                                         CornerRadius="0,0,0,0">
-                                        <Path
-                                            Width="40"
-                                            Height="40"
-                                            Data="{TemplateBinding PathDate}"
-                                            Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                            Stretch="Fill" />
+                                        <ContentPresenter
+                                            x:Name="PART_ContentPresenter"
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            TextElement.Foreground="{TemplateBinding Foreground}" />
                                     </Border>
                                 </Viewport2DVisual3D>
                                 <Viewport2DVisual3D>
@@ -98,7 +100,7 @@
                                     <Border
                                         Width="110"
                                         Height="110"
-                                        Background="{TemplateBinding BackFileBackground}"
+                                        Background="{TemplateBinding Fill}"
                                         CornerRadius="0,0,0,0"
                                         RenderTransformOrigin="0.5,0.5">
                                         <Border.RenderTransform>
@@ -106,19 +108,12 @@
                                                 <RotateTransform Angle="90" />
                                             </TransformGroup>
                                         </Border.RenderTransform>
-                                        <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>
+                                        <ContentPresenter
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            Content="{Binding ContentBack, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3DItem}}}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                            TextElement.Foreground="{TemplateBinding Foreground}" />
                                     </Border>
                                 </Viewport2DVisual3D>
                             </ContainerUIElement3D>
@@ -151,7 +146,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <UniformGrid Columns="{Binding Columns, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3D}}}" />
+                    <UniformGrid Columns="{Binding Items.Count, 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 8a98925b..da17c2ad 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
@@ -1,6 +1,7 @@
 <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" />
@@ -56,6 +57,8 @@
         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 cfe874f7..f809e0a2 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
@@ -1,35 +1,79 @@
-<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" Color="{StaticResource WD.PrimaryTextColor}" po:Freeze="True"></SolidColorBrush>
-    <SolidColorBrush x:Key="WD.WindowForegroundColorBrush" Color="{StaticResource WD.PrimaryTextColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.PrimaryTextSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.PrimaryTextColor}" />
+    <SolidColorBrush
+        x:Key="WD.WindowForegroundColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.PrimaryTextColor}" />
 
     <Color x:Key="WD.RegularTextColor" po:Freeze="True">#FFFFFF</Color>
-    <SolidColorBrush x:Key="WD.RegularTextSolidColorBrush" Color="{StaticResource WD.RegularTextColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.RegularTextSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.RegularTextColor}" />
 
     <Color x:Key="WD.DefaultBackgroundColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key="WD.DefaultBackgroundSolidColorBrush" Color="{StaticResource WD.DefaultBackgroundColor}" po:Freeze="True"></SolidColorBrush>
-    
-    <!--背景色-->
+    <SolidColorBrush
+        x:Key="WD.DefaultBackgroundSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.DefaultBackgroundColor}" />
+
+    <!--  背景色  -->
     <Color x:Key="WD.BackgroundColor" po:Freeze="True">#323232</Color>
-    <SolidColorBrush x:Key="WD.BackgroundSolidColorBrush" Color="{StaticResource WD.BackgroundColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.BackgroundSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.BackgroundColor}" />
 
     <Color x:Key="WD.WindowBorderBrushColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key="WD.WindowBorderBrushSolidColorBrush" Color="{StaticResource WD.WindowBorderBrushColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.WindowBorderBrushSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.WindowBorderBrushColor}" />
 
     <Color x:Key="WD.BaseColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key="WD.BaseSolidColorBrush" Color="{StaticResource WD.BaseColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.BaseSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.BaseColor}" />
 
     <Color x:Key="WD.BaseMoveColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key=" WD.BaseMoveSolidColorBrush" Color="{StaticResource WD.BaseMoveColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key=" WD.BaseMoveSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.BaseMoveColor}" />
 
     <Color x:Key="WD.LighterColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key="WD.LighterSolidColorBrush" Color="{StaticResource WD.LighterColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush
+        x:Key="WD.LighterSolidColorBrush"
+        po:Freeze="True"
+        Color="{StaticResource WD.LighterColor}" />
 
     <Color x:Key="WD.LightColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush x:Key="WD.LightSolidColorBrush" Color="{StaticResource WD.LightColor}" po:Freeze="True"></SolidColorBrush>
+    <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}" />
 
 </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 81e510a4..fba9cc3e 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
@@ -51,4 +51,16 @@
         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 2774bb5c..365290c0 100644
--- a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
@@ -1,7 +1,8 @@
 <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:controls="clr-namespace:WPFDevelopers.Controls"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -45,6 +46,7 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top"
                                 Style="{StaticResource WD.PathButton}"
+                                ToolTip="{Binding [Replace], Source={x:Static resx:LanguageManager.Instance}}"
                                 Visibility="Collapsed">
                                 <controls:PathIcon
                                     Width="15"
@@ -56,7 +58,8 @@
                                 x:Name="PART_AddButton"
                                 Width="40"
                                 Height="40"
-                                Style="{StaticResource WD.PathButton}">
+                                Style="{StaticResource WD.PathButton}"
+                                ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
                                 <controls:PathIcon
                                     Width="20"
                                     Height="20"
diff --git a/src/WPFDevelopers.Shared/Themes/CropImage.xaml b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
index a81e30a1..500a43ee 100644
--- a/src/WPFDevelopers.Shared/Themes/CropImage.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
@@ -22,7 +22,8 @@
                             Background="Transparent"
                             BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             BorderThickness="2"
-                            Cursor="SizeAll" />
+                            Cursor="SizeAll"
+                            Visibility="Collapsed" />
                     </Canvas>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
index 94b127bc..49a3298f 100644
--- a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
+++ b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
@@ -2,6 +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:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
@@ -88,6 +89,9 @@
                             <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" />
@@ -184,12 +188,14 @@
         <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 Background="{TemplateBinding Background}">
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition />
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index 4a86b04b..3bd5f03e 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -2,7 +2,8 @@
     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:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -112,7 +113,7 @@
                                     HorizontalAlignment="Right"
                                     helpers:ElementHelper.IsRound="True"
                                     Style="{StaticResource WD.NormalButton}"
-                                    ToolTip="关闭">
+                                    ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
                                     <controls:PathIcon
                                         Width="10"
                                         Height="10"
diff --git a/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml b/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml
deleted file mode 100644
index b16b069b..00000000
--- a/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml
+++ /dev/null
@@ -1,154 +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.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 4b62f29d..de2a2c1a 100644
--- a/src/WPFDevelopers.Shared/Themes/Pagination.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Pagination.xaml
@@ -2,7 +2,8 @@
     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:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -102,7 +103,11 @@
                     <ColumnDefinition Width="5" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+                <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>
                 <controls:NumericBox
                     x:Name="PART_CountPerPageNumericBox"
                     Grid.Column="2"
@@ -112,10 +117,14 @@
                     Minimum="1"
                     TextAlignment="Center"
                     UpDownButtonsWidth="0" />
-                <TextBlock
+                <WrapPanel
                     Grid.Column="3"
-                    VerticalAlignment="Center"
-                    Text=" 条 / 页" />
+                    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>
                 <Button
                     Grid.Column="5"
                     Width="32"
@@ -172,15 +181,19 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Margin="0,0,15,0"
-                                VerticalAlignment="Center"
-                                Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
+                            <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>
                             <StackPanel
                                 Grid.Column="1"
                                 Margin="0,0,15,0"
                                 Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text="每页 " />
+                                <TextBlock
+                                    Margin="0,0,3,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
                                 <controls:NumericBox
                                     x:Name="PART_CountPerPageNumericBox"
                                     Grid.Column="2"
@@ -190,7 +203,10 @@
                                     Minimum="1"
                                     TextAlignment="Center"
                                     UpDownButtonsWidth="0" />
-                                <TextBlock VerticalAlignment="Center" Text=" 条" />
+                                <TextBlock
+                                    Margin="3,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
                             </StackPanel>
                             <Button
                                 Grid.Column="2"
@@ -221,7 +237,10 @@
                                 <controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
                             </Button>
                             <StackPanel Grid.Column="5" Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text=" 前往 " />
+                                <TextBlock
+                                    Margin="3,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
                                 <controls:NumericBox
                                     x:Name="PART_JumpPageNumericBox"
                                     Width="32"
@@ -230,7 +249,10 @@
                                     Minimum="1"
                                     TextAlignment="Center"
                                     UpDownButtonsWidth="0" />
-                                <TextBlock VerticalAlignment="Center" Text=" 页" />
+                                <TextBlock
+                                    Margin="3,0,0,0"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
                             </StackPanel>
                         </Grid>
                     </Border>
diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index 0cfe0a2d..29f60eda 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -2,7 +2,8 @@
     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:helpers="clr-namespace:WPFDevelopers.Helpers"
+    xmlns:resx="clr-namespace:WPFDevelopers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="ButtonsStyles.xaml" />
@@ -79,7 +80,7 @@
                                         x:Name="PART_RadioButtonRectangle"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="方框">
+                                        ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -90,7 +91,7 @@
                                         x:Name="PART_RadioButtonEllipse"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="椭圆">
+                                        ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
                                         <Ellipse
                                             Width="19"
                                             Height="19"
@@ -103,7 +104,7 @@
                                         x:Name="PART_RadioButtonArrow"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="箭头">
+                                        ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -114,7 +115,7 @@
                                         x:Name="PART_RadioButtonInk"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="画笔">
+                                        ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -125,7 +126,7 @@
                                         x:Name="PART_RadioButtonText"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="文字">
+                                        ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -141,7 +142,7 @@
                                         x:Name="PART_ButtonSave"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="保存">
+                                        ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -152,7 +153,7 @@
                                         x:Name="PART_ButtonCancel"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="取消">
+                                        ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="14"
                                             Height="14"
@@ -163,7 +164,7 @@
                                         x:Name="PART_ButtonComplete"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="完成">
+                                        ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
                                         <controls:PathIcon
                                             Width="20"
                                             Height="15"
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 25acc0ee..fdc20b1f 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -48,7 +48,6 @@ 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 0b6b5bc7..9c851e0b 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -49,7 +49,6 @@ 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 ac8b3ddf..53988172 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -9,6 +9,12 @@
     <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" />
@@ -37,13 +43,17 @@
     <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" />
@@ -54,7 +64,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\BasicBarChart\BasicBarChart.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartBar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreatheLight\BreathLamp.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubbleControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubblleCanvas.cs" />
@@ -81,10 +91,9 @@
     <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\WPFMessageBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageBox\WDMessageBox.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" />
@@ -113,8 +122,7 @@
     <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\RadarChart\RadarChart.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\RadarChart\RadarModel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRadar.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Ruler\Ruler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCapture.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCut.cs" />
@@ -149,6 +157,7 @@
     <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" />
@@ -523,10 +532,6 @@
       <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>
@@ -561,6 +566,9 @@
     </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 9bd16c28..4014fd8b 100644
--- a/src/WPFDevelopers.sln
+++ b/src/WPFDevelopers.sln
@@ -80,6 +80,8 @@ 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

From fb327cb688c6ca7149bd5b45836c803cddd14bc8 Mon Sep 17 00:00:00 2001
From: vickyqu115 <101777355+vickyqu115@users.noreply.github.com>
Date: Tue, 28 May 2024 10:59:24 +0800
Subject: [PATCH 003/123] Update Language.ko-KR.resx

Update .resx files for multilingual support
---
 .../Languages/Language.ko-KR.resx             | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
index 075244c7..e4636cd3 100644
--- a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
+++ b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
@@ -118,13 +118,13 @@
     <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>
+    <value>확인</value>
   </data>
   <data name="Cancel" xml:space="preserve">
     <value>취소</value>
   </data>
   <data name="Yes" xml:space="preserve">
-    <value>예</value>
+    <value>네</value>
   </data>
   <data name="No" xml:space="preserve">
     <value>아니오</value>
@@ -136,13 +136,13 @@
     <value>페이지</value>
   </data>
   <data name="Items" xml:space="preserve">
-    <value>바</value>
+    <value>행</value>
   </data>
   <data name="Total" xml:space="preserve">
-    <value>전부의</value>
+    <value>전체</value>
   </data>
   <data name="Rectangle" xml:space="preserve">
-    <value>직사각형</value>
+    <value>사각형</value>
   </data>
   <data name="Ellipse" xml:space="preserve">
     <value>타원</value>
@@ -151,10 +151,10 @@
     <value>화살표</value>
   </data>
   <data name="Ink" xml:space="preserve">
-    <value>화필</value>
+    <value>잉크</value>
   </data>
   <data name="Text" xml:space="preserve">
-    <value>문자</value>
+    <value>텍스트</value>
   </data>
   <data name="Save" xml:space="preserve">
     <value>저장</value>
@@ -172,10 +172,10 @@
     <value>교체</value>
   </data>
   <data name="Clear" xml:space="preserve">
-    <value>비우기</value>
+    <value>지우기</value>
   </data>
   <data name="Restore" xml:space="preserve">
-    <value>아래로 복원</value>
+    <value>복원</value>
   </data>
   <data name="Minimize" xml:space="preserve">
     <value>최소화</value>
@@ -183,4 +183,4 @@
   <data name="Maximize" xml:space="preserve">
     <value>최대화</value>
   </data>
-</root>
\ No newline at end of file
+</root>

From b2748cb9df3b5f7f631a22ca081c5da358d8b499 Mon Sep 17 00:00:00 2001
From: zhaotianff <zhaotianff@163.com>
Date: Wed, 29 May 2024 15:23:16 +0800
Subject: [PATCH 004/123] add PackIconKind.ChevronUp

---
 src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
index 55c20085..d59266fd 100644
--- a/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
+++ b/src/WPFDevelopers.Shared/Controls/PathIcon/PackIconKind.cs
@@ -5,6 +5,7 @@ namespace WPFDevelopers.Controls
     public enum PackIconKind
     {
         [Description("WD.CheckMarkGeometry")] CheckMark,
+        [Description("WD.ChevronUpGeometry")] ChevronUp,
         [Description("WD.ChevronDownGeometry")] ChevronDown,
         [Description("WD.BlackoutGeometry")] Blackout,
         [Description("WD.PreviousGeometry")] Previous,

From 4052914c353f3299714a99113d5507c2404ba72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 16 Jun 2024 18:19:30 +0800
Subject: [PATCH 005/123] MesageBox Buttons support Radius

The messagebox operation area button supports rounded corners
---
 .../Controls/MessageBox/MessageBox.cs         | 23 ++++++++---------
 .../Controls/MessageBox/WDMessageBox.cs       | 25 +++++++++++++++----
 .../Styles/Styles.MessageBox.xaml             |  5 ++++
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
index 64354120..558e29a7 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
@@ -1,39 +1,38 @@
-using System.Linq;
-using System.Windows;
+using System.Windows;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
     public static class MessageBox
     {
-        public static MessageBoxResult Show(string messageBoxText,Window owner = null)
+        public static MessageBoxResult Show(string messageBoxText, Window owner = null, double buttonRadius = 0d)
         {
-            var msg = new WDMessageBox(messageBoxText);
+            var msg = new WDMessageBox(messageBoxText, buttonRadius);
             return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, Window owner = null)
+        public static MessageBoxResult Show(string messageBoxText, string caption, Window owner = null, double buttonRadius = 0d)
         {
-            var msg = new WDMessageBox(messageBoxText, caption);
+            var msg = new WDMessageBox(messageBoxText, caption, buttonRadius);
             return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, Window owner = null)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, Window owner = null, double buttonRadius = 0d)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, button);
+            var msg = new WDMessageBox(messageBoxText, caption, button, buttonRadius);
             return GetWindow(msg, owner);
         }
 
-        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon, Window owner = null)
+        public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon, Window owner = null, double buttonRadius = 0d)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, icon);
+            var msg = new WDMessageBox(messageBoxText, caption, icon, buttonRadius);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button,
-            MessageBoxImage icon, Window owner = null)
+            MessageBoxImage icon, Window owner = null, double buttonRadius = 0d)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, button, icon);
+            var msg = new WDMessageBox(messageBoxText, caption, button, icon, buttonRadius);
             return GetWindow(msg, owner);
         }
 
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
index eaa52f7f..2a7532b4 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
@@ -49,40 +49,55 @@ internal sealed class WDMessageBox : Window
         private TextBlock _title;
 
 
+        public CornerRadius ButtonCornerRadius
+        {
+            get { return (CornerRadius)GetValue(ButtonRadiusProperty); }
+            set { SetValue(ButtonRadiusProperty, value); }
+        }
+
+        public static readonly DependencyProperty ButtonRadiusProperty =
+            DependencyProperty.Register("ButtonCornerRadius", typeof(CornerRadius), typeof(WDMessageBox), new PropertyMetadata(null));
+
+
         static WDMessageBox()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(WDMessageBox),
                 new FrameworkPropertyMetadata(typeof(WDMessageBox)));
         }
 
-        public WDMessageBox(string message)
+        public WDMessageBox(string message, double buttonRadius = 0d)
         {
             _messageString = message;
+            ButtonCornerRadius = new CornerRadius(buttonRadius);
         }
 
-        public WDMessageBox(string message, string caption)
+        public WDMessageBox(string message, string caption, double buttonRadius = 0d)
         {
             _titleString = caption;
             _messageString = message;
+            ButtonCornerRadius = new CornerRadius(buttonRadius);
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxButton button)
+        public WDMessageBox(string message, string caption, MessageBoxButton button, double buttonRadius = 0d)
         {
             _titleString = caption;
             _messageString = message;
+            ButtonCornerRadius = new CornerRadius(buttonRadius);
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxImage image)
+        public WDMessageBox(string message, string caption, MessageBoxImage image, double buttonRadius = 0d)
         {
             _titleString = caption;
             _messageString = message;
+            ButtonCornerRadius = new CornerRadius(buttonRadius);
             DisplayImage(image);
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image)
+        public WDMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image, double buttonRadius = 0d)
         {
             _titleString = caption;
             _messageString = message;
+            ButtonCornerRadius = new CornerRadius(buttonRadius);
             DisplayImage(image);
             DisplayButtons(button);
         }
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
index 7ffeee25..922fe593 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
@@ -2,6 +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">
 
     <ResourceDictionary.MergedDictionaries>
@@ -90,6 +91,7 @@
                                     <Button
                                         x:Name="PART_ButtonYes"
                                         Width="60"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         Content="{Binding [Yes], Source={x:Static resx:LanguageManager.Instance}}"
                                         Style="{DynamicResource WD.PrimaryButton}"
                                         Visibility="Collapsed" />
@@ -97,18 +99,21 @@
                                         x:Name="PART_ButtonNo"
                                         Width="60"
                                         Margin="6,0,0,0"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}"
                                         Visibility="Collapsed" />
                                     <Button
                                         x:Name="PART_ButtonOK"
                                         Width="60"
                                         Margin="6,0,0,0"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         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"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}"
                                         Visibility="Collapsed" />
                                 </UniformGrid>

From 6fb36a7a7562355f37c9cccf7999e0f057b0e137 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 16 Jun 2024 18:19:34 +0800
Subject: [PATCH 006/123] Update ChartRect.cs

---
 src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
index bc61817d..49f84401 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
@@ -9,8 +9,6 @@ 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;

From 5f2d7d250c1e80705a174f92a70a4780f33b70f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 16 Jun 2024 18:19:40 +0800
Subject: [PATCH 007/123] Update BasicControlsExample.xaml.cs

---
 .../ExampleViews/BasicControlsExample.xaml.cs                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
index e4348e9a..c9563d50 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml.cs
@@ -94,7 +94,7 @@ private void MainView_Loaded(object sender, RoutedEventArgs e)
 
         private void btnInformation_Click(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("文件删除成功。", "消息", MessageBoxButton.OK, MessageBoxImage.Information);
+            MessageBox.Show("文件删除成功。", "消息", MessageBoxButton.OK, MessageBoxImage.Information, buttonRadius: 4);
         }
 
         private void btnWarning_Click(object sender, RoutedEventArgs e)
@@ -109,7 +109,7 @@ private void btnError_Click(object sender, RoutedEventArgs e)
 
         private void btnQuestion_Click(object sender, RoutedEventArgs e)
         {
-            MessageBox.Show("当前文件不存在,是否继续?", "询问", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+            MessageBox.Show("当前文件不存在,是否继续?", "询问", MessageBoxButton.OKCancel, MessageBoxImage.Question, buttonRadius: 4);
         }
 
         private void GithubHyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)

From 785f86f2c659f4522aeee1f8fb5518a0885296ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 16 Jun 2024 18:19:48 +0800
Subject: [PATCH 008/123] Update BasicControlsExample.xaml

---
 .../ExampleViews/BasicControlsExample.xaml                     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 791196ee..5dfd64b4 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -120,6 +120,7 @@
                         Margin="0,10"
                         Rows="1">
                         <Button
+                            wd:ElementHelper.CornerRadius="3"
                             Click="Button_Click"
                             Content="ToolWindow"
                             Style="{DynamicResource WD.PrimaryButton}" />
@@ -138,12 +139,14 @@
                         Margin="0,10"
                         Rows="1">
                         <Button
+                            wd:ElementHelper.CornerRadius="3"
                             Click="Loading_Click"
                             Content="Loading"
                             Style="{DynamicResource WD.PrimaryButton}" />
                         <Button
                             Name="btnLoadingTask"
                             Margin="10,0"
+                            wd:ElementHelper.CornerRadius="3"
                             Click="LoadingTask_Click"
                             Content="LoadingTask"
                             Style="{DynamicResource WD.SuccessPrimaryButton}" />

From a0681650a9febed55fb31d242be4d4e87793eab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 16 Jun 2024 18:19:52 +0800
Subject: [PATCH 009/123] Update Theme.xaml

---
 src/WPFDevelopers.Net40/Themes/Theme.xaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 03ddea0a..2e56c421 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -3767,10 +3767,10 @@
 							</controls:SmallPanel>
 							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
 								<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_ButtonYes" Width="60" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>

From a1b42d1e55142c33b875cf14e752325ecb7b2f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:00:44 +0800
Subject: [PATCH 010/123] Update Styles.ComboBox.xaml

---
 src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
index 9c46e769..debdf670 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
@@ -11,7 +11,7 @@
     <ControlTemplate x:Key="WD.ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
         <Border
             x:Name="PART_Border"
-            Padding="6,0"
+            Padding="6,1.2"
             BorderThickness="0"
             SnapsToDevicePixels="true">
             <Grid Background="Transparent">

From d677060a9cd797695a4caa423a0d36d31314ec22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:01:34 +0800
Subject: [PATCH 011/123] Update MultiSelectComboBox.xaml

---
 src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
index 43fc590c..5a52b5a9 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
@@ -18,6 +18,7 @@
         <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
         <Setter Property="BorderThickness" Value="0" />
         <Setter Property="Margin" Value="1,0" />
+        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
         <Setter Property="Template">
             <Setter.Value>
@@ -28,11 +29,13 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="true">
                         <CheckBox
                             MinHeight="{TemplateBinding MinHeight}"
                             HorizontalAlignment="Stretch"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                             Foreground="{TemplateBinding Foreground}"
                             IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
                             <ContentPresenter
@@ -125,11 +128,11 @@
                             Visibility="Collapsed" />
                         <ToggleButton
                             x:Name="PART_ToggleButton"
+                            Background="{TemplateBinding Background}"
                             ClickMode="Release"
                             Focusable="False"
                             IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}"
                             Style="{x:Null}"
-                            Background="{TemplateBinding Background}"
                             Template="{StaticResource WD.ComboBoxToggleButton}" />
                         <Popup
                             x:Name="PART_Popup"

From 77ea3941c6f78b283f11adcd359d4f71c60fe8a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:01:38 +0800
Subject: [PATCH 012/123] Update MultiSelectSearchComboBox.xaml

---
 .../Themes/MultiSelectSearchComboBox.xaml                 | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
index e831d637..ec3c2fa2 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
@@ -119,11 +119,14 @@
                                     <TextBox
                                         x:Name="PART_TextBox"
                                         Margin="6,0"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                        helpers:ElementHelper.IsClear="True"
                                         helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
                                     <CheckBox
                                         x:Name="PART_SelectAll"
                                         Grid.Row="1"
                                         Margin="4"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         Content="{TemplateBinding SelectAllContent}"
                                         Visibility="{TemplateBinding IsSelectAllActive,
                                                                      Converter={StaticResource WD.Bool2VisibilityConverter}}" />
@@ -134,6 +137,7 @@
                                         Padding="{TemplateBinding Padding}"
                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         BorderBrush="{TemplateBinding BorderBrush}"
                                         BorderThickness="0"
                                         DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -151,6 +155,7 @@
                                         Padding="{TemplateBinding Padding}"
                                         HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                         VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         BorderBrush="{TemplateBinding BorderBrush}"
                                         BorderThickness="0"
                                         DisplayMemberPath="{TemplateBinding DisplayMemberPath}"
@@ -195,6 +200,9 @@
                         <Trigger Property="Text" Value="{x:Null}">
                             <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
                         </Trigger>
+                        <Trigger Property="IsSelectAllActive" Value="False">
+                            <Setter TargetName="PART_TextBox" Property="Margin" Value="6,2" />
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

From 84f29b10693385aaeadfc80bcaf3e2c8decd3e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:04:08 +0800
Subject: [PATCH 013/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#102=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
index c4991883..b6846a43 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
@@ -454,7 +454,7 @@ private void SearchText(string _text)
                     if (string.IsNullOrWhiteSpace(str))
                         str = item.ToString();
                     if (!string.IsNullOrWhiteSpace(str))
-                        if (str.Contains(text.ToUpperInvariant()))
+                        if (str.ToUpperInvariant().Contains(text.ToUpperInvariant()))
                             listSearch.Add(item);
                 }
 

From 82a40aa115f7cc0d5a342a0002755ebcdf677edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:04:20 +0800
Subject: [PATCH 014/123] Update MultiSelectSearchComboBoxExample.xaml.cs

---
 .../MultiSelectSearchComboBoxExample.xaml.cs        | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
index 3934d1e7..68aa8206 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
@@ -24,6 +24,14 @@ private void MultiSelectSearchComboBoxExample_Loaded(object sender, RoutedEventA
                 list.Add(i.ToString());
             MyMultiSelectionSearchComboBox2.ItemsSource = list;
             MyMultiSelectionSearchComboBox2.SelectedItems = list.Skip(3).ToList();
+
+            var list2 = new List<UserInfo>();
+            list2.Add(new UserInfo() { ID = "0", Name = "343DST.com" });
+            list2.Add(new UserInfo() { ID = "1", Name = "ABCV.wang" });
+            list2.Add(new UserInfo() { ID = "2", Name = "PPOI.xu" });
+            list2.Add(new UserInfo() { ID = "3", Name = "josh.peng" });
+            MyMultiSelectionSearchComboBox3.ItemsSource = list2;
+
         }
 
         private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
@@ -31,4 +39,9 @@ private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
             WPFDevelopers.Controls.MessageBox.Show($"{MyMultiSelectionSearchComboBox2.Text} \r\n总共选中:{MyMultiSelectionSearchComboBox2.SelectedItems.Count} 条","选中内容",MessageBoxButton.OK,MessageBoxImage.Information);      
         }
     }
+    public class UserInfo
+    {
+        public string ID { get; set; }
+        public string Name { get; set; }
+    }
 }

From 573a10642af971eefbaa3afca15f9b8d81be6cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:04:23 +0800
Subject: [PATCH 015/123] Update MultiSelectSearchComboBoxExample.xaml

---
 .../MultiSelectSearchComboBoxExample.xaml        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
index 75434114..9be76a4c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml
@@ -71,11 +71,17 @@
                     wd:ElementHelper.Watermark="下拉多选搜索"
                     Delimiter="^"
                     IsSelectAllActive="True"
-                    SearchWatermark="请输入搜索内容">
-                    <wd:MultiSelectionSearchComboBox.DataContext>
-                        <vm:DrawingExampleVM />
-                    </wd:MultiSelectionSearchComboBox.DataContext>
-                </wd:MultiSelectionSearchComboBox>
+                    SearchWatermark="请输入搜索内容" />
+                <wd:MultiSelectionSearchComboBox
+                    Name="MyMultiSelectionSearchComboBox3"
+                    Width="200"
+                    Height="38"
+                    HorizontalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Delimiter=","
+                    DisplayMemberPath="Name"
+                    SelectedValuePath="ID" 
+                    wd:ElementHelper.CornerRadius="3"/>
             </UniformGrid>
         </Grid>
         <controls:CodeViewer.SourceCodes>

From 0f6f16fb171c09876e10208e02c4d287f3f3a521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 4 Jul 2024 23:04:25 +0800
Subject: [PATCH 016/123] Update MultiSelectComboBoxExample.xaml

---
 .../ExampleViews/MultiSelectComboBoxExample.xaml                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
index 3742f396..3496b003 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectComboBoxExample.xaml
@@ -51,6 +51,7 @@
                     Height="38"
                     HorizontalAlignment="Center"
                     VerticalContentAlignment="Center"
+                    wd:ElementHelper.CornerRadius="3"
                     wd:ElementHelper.Watermark="MultiSelectComboBox"
                     DisplayMemberPath="Number"
                     IsSelectAllActive="True"

From 66e2cc4840c36d69da5ff038b6f3ee6c0c24e2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sat, 6 Jul 2024 00:18:27 +0800
Subject: [PATCH 017/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#102=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
index b6846a43..75e9a248 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
@@ -533,8 +533,7 @@ private static void OnSelectedItemsChanged(DependencyObject d, DependencyPropert
                     object model = null;
                     if (!string.IsNullOrWhiteSpace(name))
                         model = mltiSelectionSearchComboBox._listBox.ItemsSource.OfType<object>().FirstOrDefault(h =>
-                            mltiSelectionSearchComboBox.GetPropertyValue(h).ToUpperInvariant()
-                                .Equals(name));
+                            mltiSelectionSearchComboBox.GetPropertyValue(h) == name);
                     else
                         model = mltiSelectionSearchComboBox._listBox.ItemsSource.OfType<object>()
                             .FirstOrDefault(h => h == item);

From 389d97cc259e5ab6e20de25c7544dfdedecc75f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 16 Jul 2024 00:42:07 +0800
Subject: [PATCH 018/123] Update MultiSelectSearchComboBoxExample.xaml.cs

---
 .../ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
index 68aa8206..e31d6848 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MultiSelectSearchComboBoxExample.xaml.cs
@@ -31,7 +31,7 @@ private void MultiSelectSearchComboBoxExample_Loaded(object sender, RoutedEventA
             list2.Add(new UserInfo() { ID = "2", Name = "PPOI.xu" });
             list2.Add(new UserInfo() { ID = "3", Name = "josh.peng" });
             MyMultiSelectionSearchComboBox3.ItemsSource = list2;
-
+            MyMultiSelectionSearchComboBox3.SelectedItems = list2.Where(x => x.ID == "1" || x.ID == "3").ToList();
         }
 
         private void Button_Click(object sender, System.Windows.RoutedEventArgs e)

From c308669d6c117cab1a4d85e73bda61798c68656c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 16 Jul 2024 00:45:00 +0800
Subject: [PATCH 019/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#104=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
index 558e29a7..d4ca3779 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
@@ -48,7 +48,7 @@ private static MessageBoxResult GetWindow(WDMessageBox msg, Window owner = null)
             else
             {
                 var win = ControlsHelper.GetDefaultWindow();
-                if (win != null)
+                if (win != null && win != msg)
                 {
                     if (win.WindowState == WindowState.Minimized)
                         msg.BorderThickness = new Thickness(1);

From 01f6def9a4bcd22ea9a4e60815f75b99dab3ee4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 18 Jul 2024 00:41:17 +0800
Subject: [PATCH 020/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#102=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MultiSelectSearchComboBox.cs                     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
index 75e9a248..120ace6e 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Windows;
@@ -58,7 +59,7 @@ public class MultiSelectionSearchComboBox : Control
 
         public static readonly DependencyProperty SelectAllContentProperty =
             DependencyProperty.Register("SelectAllContent", typeof(object), typeof(MultiSelectionSearchComboBox),
-                new PropertyMetadata("全选"));
+                new PropertyMetadata(LanguageManager.Instance["SelectAll"]));
 
         public static readonly DependencyProperty IsSelectAllActiveProperty =
             DependencyProperty.Register("IsSelectAllActive", typeof(bool), typeof(MultiSelectionSearchComboBox),
@@ -190,6 +191,7 @@ public event RoutedEventHandler Closed
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
+            LanguageManager.Instance.PropertyChanged += Instance_PropertyChanged;
             selectedList = new List<object>();
             selectedSearchList = new List<object>();
             selectedItems = new List<object>();
@@ -232,6 +234,10 @@ public override void OnApplyTemplate()
             }
         }
 
+        private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+           SelectAllContent = LanguageManager.Instance["SelectAll"];
+        }
 
         private void _listBoxSearch_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
@@ -380,8 +386,8 @@ private void _listBoxSearch_SelectionChanged(object sender, SelectionChangedEven
             if (e.AddedItems.Count > 0)
             {
                 foreach (var item in e.AddedItems)
-                    if (!selectedSearchList.Contains(item))
-                        selectedSearchList.Add(item);
+                    if (!_listBox.SelectedItems.Contains(item))
+                        _listBox.SelectedItems.Add(item);
                 Combination();
                 SelectionChecked(_listBoxSearch);
             }

From a91301d1afdcddc1b152d6db5b11337ed67c6b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 18 Jul 2024 00:41:21 +0800
Subject: [PATCH 021/123] Update MultiSelectComboBox.cs

---
 .../MultiSelectComboBox/MultiSelectComboBox.cs   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
index 140efa63..bd3d9757 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
@@ -24,7 +24,7 @@ public static readonly DependencyProperty MaxDropDownHeightProperty
 
         public static readonly DependencyProperty SelectAllContentProperty =
             DependencyProperty.Register("SelectAllContent", typeof(object), typeof(MultiSelectComboBox),
-                new PropertyMetadata("全选"));
+                new PropertyMetadata(LanguageManager.Instance["SelectAll"]));
 
         public static readonly DependencyProperty IsSelectAllActiveProperty =
             DependencyProperty.Register("IsSelectAllActive", typeof(bool), typeof(MultiSelectComboBox),
@@ -48,7 +48,6 @@ public bool IsDropDownOpen
             set => SetValue(IsDropDownOpenProperty, value);
         }
 
-
         [Bindable(true)]
         [Category("Layout")]
         [TypeConverter(typeof(LengthConverter))]
@@ -58,28 +57,24 @@ public double MaxDropDownHeight
             set => SetValue(MaxDropDownHeightProperty, value);
         }
 
-
         public object SelectAllContent
         {
             get => GetValue(SelectAllContentProperty);
             set => SetValue(SelectAllContentProperty, value);
         }
 
-
         public bool IsSelectAllActive
         {
             get => (bool) GetValue(IsSelectAllActiveProperty);
             set => SetValue(IsSelectAllActiveProperty, value);
         }
 
-
         public string Delimiter
         {
             get => (string) GetValue(DelimiterProperty);
             set => SetValue(DelimiterProperty, value);
         }
 
-
         public string Text
         {
             get => (string) GetValue(TextProperty);
@@ -99,7 +94,6 @@ private static void OnTextChanged(DependencyObject d, DependencyPropertyChangedE
         {
         }
 
-
         protected override bool IsItemItsOwnContainerOverride(object item)
         {
             return item is MultiSelectComboBoxItem;
@@ -115,17 +109,21 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
             UpdateText();
             base.OnSelectionChanged(e);
         }
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
-
+            LanguageManager.Instance.PropertyChanged += Instance_PropertyChanged;
             _popup = GetTemplateChild(PART_Popup) as Popup;
             _multiSelectComboBoxItem = GetTemplateChild(PART_CheckBoxAll) as MultiSelectComboBoxItem;
             _multiSelectComboBoxItem.Selected += _MultiSelectComboBoxItem_Selected;
             _multiSelectComboBoxItem.Unselected += _MultiSelectComboBoxItem_Unselected;
         }
 
+        private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            SelectAllContent = LanguageManager.Instance["SelectAll"];
+        }
+
         private void _MultiSelectComboBoxItem_Unselected(object sender, RoutedEventArgs e)
         {
             if (_ignoreTextValueChanged) return;

From 75826d34a708cf4c9a53d2e9790256e0e51129d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 18 Jul 2024 00:41:27 +0800
Subject: [PATCH 022/123] Update Language.en-US.resx

---
 src/WPFDevelopers.Shared/Languages/Language.en-US.resx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Languages/Language.en-US.resx b/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
index 4a9658df..9485b514 100644
--- a/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
+++ b/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
@@ -183,4 +183,7 @@
   <data name="Restore" xml:space="preserve">
     <value>Restore</value>
   </data>
+  <data name="SelectAll" xml:space="preserve">
+    <value>Select All</value>
+  </data>
 </root>
\ No newline at end of file

From d632db4f171cbb203b08e23b55c1d749c2171c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 18 Jul 2024 00:41:30 +0800
Subject: [PATCH 023/123] Update Language.ko-KR.resx

---
 src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
index e4636cd3..08432df3 100644
--- a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
+++ b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
@@ -183,4 +183,7 @@
   <data name="Maximize" xml:space="preserve">
     <value>최대화</value>
   </data>
-</root>
+  <data name="SelectAll" xml:space="preserve">
+    <value>모두선택</value>
+  </data>
+</root>
\ No newline at end of file

From 07f77b408c9d2ac8756f2d2d99e217df69c92b78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 18 Jul 2024 00:41:33 +0800
Subject: [PATCH 024/123] Update Language.resx

---
 src/WPFDevelopers.Shared/Languages/Language.resx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Languages/Language.resx b/src/WPFDevelopers.Shared/Languages/Language.resx
index 2c8474ab..c96fa983 100644
--- a/src/WPFDevelopers.Shared/Languages/Language.resx
+++ b/src/WPFDevelopers.Shared/Languages/Language.resx
@@ -163,4 +163,7 @@
   <data name="Restore" xml:space="preserve">
     <value>向下还原</value>
   </data>
+  <data name="SelectAll" xml:space="preserve">
+    <value>全选</value>
+  </data>
 </root>
\ No newline at end of file

From 49d494a913951035ace7b3e588a2887f499ea8af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 24 Jul 2024 23:01:46 +0800
Subject: [PATCH 025/123] Update ChartLine.cs

---
 src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
index 21302a93..1df0244c 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
@@ -48,7 +48,7 @@ protected override void OnRender(DrawingContext drawingContext)
                 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}");
+                dicts.Add(nRect, $"{item.Key} : {item.Value.ToString("#,##0.#########################")}");
             }
             PointCache = dicts;
             if(points.Count > 1)

From 72c619b3a934fd19c12171f3e66448d3e646e031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 24 Jul 2024 23:01:48 +0800
Subject: [PATCH 026/123] Update ChartBar.cs

---
 src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
index dc764aec..c1e31d20 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
@@ -24,7 +24,7 @@ protected override void OnRender(DrawingContext drawingContext)
                 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}");
+                dicts.Add(nRect, $"{item.Key} : {item.Value.ToString("#,##0.#########################")}");
             }
             PointCache = dicts;
         }

From e2632a85405b0c9007f87ab86caef149698e7b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 24 Jul 2024 23:02:36 +0800
Subject: [PATCH 027/123] Create ChartPie

---
 .../ExampleViews/ChartPieExample.xaml         |  40 +++
 .../ExampleViews/ChartPieExample.xaml.cs      |  68 +++++
 .../Helpers/MenuEnum.cs                       |   1 +
 .../ViewModels/MainVM.cs                      |   3 +
 .../WPFDevelopers.Samples.Shared.projitems    |   7 +
 .../WPFDevelopers.SamplesCode.csproj          |   4 +
 .../Controls/Charts/ChartPie.cs               | 250 ++++++++++++++++++
 .../WPFDevelopers.Shared.projitems            |   1 +
 8 files changed, 374 insertions(+)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
new file mode 100644
index 00000000..0fc4bf16
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml
@@ -0,0 +1,40 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.ChartPieExample"
+    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="300"
+                    Margin="30,0"
+                    Background="{DynamicResource WD.BackgroundSolidColorBrush}">
+                    <wd:ChartPie Datas="{Binding Datas, RelativeSource={RelativeSource AncestorType=local:ChartPieExample}}" />
+                </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/ChartPieExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartPieExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
new file mode 100644
index 00000000..4a02bb14
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
@@ -0,0 +1,68 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Windows;
+using System.Windows.Controls;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// ChartPieExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class ChartPieExample : 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(ChartPieExample), new PropertyMetadata(null));
+
+        private Dictionary<string, IEnumerable<KeyValuePair<string, double>>> keyValues = new Dictionary<string, IEnumerable<KeyValuePair<string, double>>>();
+        private int _index = 0;
+        public ChartPieExample()
+        {
+            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.123456) ,
+                new KeyValuePair<string, double>("Sat", 200) ,
+                new KeyValuePair<string, double>("Sun", 300) ,
+            };
+            var models2 = new[]
+            {
+                new KeyValuePair<string, double>("Bing", 120),
+                new KeyValuePair<string, double>("Google", 170),
+                new KeyValuePair<string, double>("Baidu", 30),
+                new KeyValuePair<string, double>("Github", 200),
+                new KeyValuePair<string, double>("Stack Overflow", 100) ,
+                new KeyValuePair<string, double>("Runoob", 180) ,
+                new KeyValuePair<string, double>("Open AI", 90) ,
+                new KeyValuePair<string, double>("Open AI2", 93) ,
+                new KeyValuePair<string, double>("Open AI3", 94) ,
+                new KeyValuePair<string, double>("Open AI4", 95) ,
+            };
+            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/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index e9b21987..dd0a98bf 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -82,6 +82,7 @@ public enum MenuEnum
         WaterfallPanel,
         ChartLine,
         Drap,
+        ChartPie,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index d873cb5b..90cec06f 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -349,6 +349,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Drap:
                     ControlPanel = new DrapViewExample();
                     break;
+                case MenuEnum.ChartPie:
+                    ControlPanel = new ChartPieExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 798e7ea1..bdf4b191 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -107,6 +107,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartLineExample.xaml.cs">
       <DependentUpon>ChartLineExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartPieExample.xaml.cs">
+      <DependentUpon>ChartPieExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChatEmojiExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>ChatEmojiExample.xaml</DependentUpon>
@@ -584,6 +587,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartPieExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChatEmojiExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 94a94a89..2b61d3f5 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -144,6 +144,7 @@
 		<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" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -488,5 +489,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartLineExample.xaml">
 			<Link>ExampleViews\ChartLineExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml">
+			<Link>ExampleViews\ChartPieExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs
new file mode 100644
index 00000000..43a0877c
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs
@@ -0,0 +1,250 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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.Media.Effects;
+using System.Windows.Shapes;
+
+namespace WPFDevelopers.Controls
+{
+    public class ChartPie : Control
+    {
+        private double centerX, centerY, radius;
+        private Popup _popup;
+        private Border _border;
+        private StackPanel _stackPanel;
+        private TextBlock _textBlock;
+        private Ellipse _ellipse;
+        private bool isPopupOpen = false;
+        private KeyValuePair<PathGeometry, string> _lastItem;
+        private Dictionary<PathGeometry, string> pathGeometries = new Dictionary<PathGeometry, string>();
+
+        private Color[] vibrantColors;
+
+        public static readonly DependencyProperty DatasProperty =
+       DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>),
+           typeof(ChartPie), new UIPropertyMetadata(DatasChanged));
+        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 ChartPie;
+            if (e.NewValue != null)
+                ctrl.InvalidateVisual();
+        }
+
+        public ChartPie()
+        {
+            vibrantColors = new Color[]
+            {
+                Color.FromArgb(255, 84, 112, 198),
+                Color.FromArgb(255, 145, 204, 117),
+                Color.FromArgb(255, 250, 200, 88),
+                Color.FromArgb(255, 238, 102, 102),
+                Color.FromArgb(255, 115, 192, 222),
+                Color.FromArgb(255, 59, 162, 114),
+                Color.FromArgb(255, 252, 132, 82),
+                Color.FromArgb(255, 154, 96, 180),
+                Color.FromArgb(255, 234, 124, 204),
+            };
+        }
+        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 (!IsMouseOverGeometry(_lastItem.Key))
+                        {
+                            _popup.IsOpen = false;
+                            isPopupOpen = false;
+                            _lastItem = new KeyValuePair<PathGeometry, string>();
+                        }
+                    }
+                };
+                _popup.Closed += delegate
+                {
+                    isPopupOpen = false;
+                };
+
+                _textBlock = new TextBlock()
+                {
+                    HorizontalAlignment = HorizontalAlignment.Center,
+                    VerticalAlignment = VerticalAlignment.Center,
+                    Foreground = (Brush)Application.Current.TryFindResource("WD.WindowForegroundColorBrush"),
+                    Padding = new Thickness(4, 0, 2, 0)
+                };
+                _ellipse = new Ellipse()
+                {
+                    Width = 10,
+                    Height = 10,
+                    Stroke = Brushes.White,
+                };
+                _stackPanel = new StackPanel() { Orientation = Orientation.Horizontal };
+                _stackPanel.Children.Add(_ellipse);
+                _stackPanel.Children.Add(_textBlock);
+
+                _border = new Border
+                {
+                    Child = _stackPanel,
+                    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;
+            }
+            int index = 0;
+            foreach (var pathGeometry in pathGeometries)
+            {
+                if (IsMouseOverGeometry(pathGeometry.Key))
+                {
+                    isPopupOpen = true;
+                    _ellipse.Fill = new SolidColorBrush()
+                    {
+                        Color = vibrantColors[index >= vibrantColors.Length ? index % vibrantColors.Length : index]
+                    };
+                    _textBlock.Text = pathGeometry.Value;
+                    //var bounds = pathGeometry.Key.Bounds;
+                    //var center = new Point(bounds.Left + bounds.Width / 2, bounds.Top + bounds.Height / 2);
+                    //_popup.HorizontalOffset = center.X - (_border.ActualWidth / 2);
+                    //_popup.VerticalOffset = center.Y - (_border.ActualHeight / 2);
+                    _popup.IsOpen = true;
+                    _lastItem = pathGeometry;
+                    break;
+                }
+                index++;
+            }
+        }
+        private bool IsMouseOverGeometry(PathGeometry pathGeometry)
+        {
+            var mousePosition = Mouse.GetPosition(this);
+            return pathGeometry.FillContains(mousePosition);
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+            if (Datas == null || Datas.Count() == 0)
+                return;
+            SnapsToDevicePixels = true;
+            UseLayoutRounding = true;
+            pathGeometries.Clear();
+            var drawingPen = CreatePen(2);
+            var boldDrawingPen = CreatePen(4);
+            var pieWidth = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
+            var pieHeight = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
+            centerX = pieWidth / 2;
+            centerY = pieHeight / 2;
+            radius = ActualWidth > ActualHeight ? ActualHeight / 2 : ActualWidth / 2;
+            var angle = 0d;
+            var prevAngle = 0d;
+            var sum = Datas.Select(ser => ser.Value).Sum();
+            var index = 0;
+            var isFirst = false;
+            foreach (var item in Datas)
+            {
+
+                var arcStartX = radius * Math.Cos(angle * Math.PI / 180) + centerX;
+                var arcStartY = radius * Math.Sin(angle * Math.PI / 180) + centerY;
+                angle = item.Value / sum * 360 + prevAngle;
+                var arcEndX = 0d;
+                var arcEndY = 0d;
+                if (Datas.Count() == 1 && angle == 360)
+                {
+                    isFirst = true;
+                    arcEndX = centerX + Math.Cos(359.99999 * Math.PI / 180) * radius;
+                    arcEndY = (radius * Math.Sin(359.99999 * Math.PI / 180)) + centerY;
+                }
+                else
+                {
+                    arcEndX = centerX + Math.Cos(angle * Math.PI / 180) * radius;
+                    arcEndY = (radius * Math.Sin(angle * Math.PI / 180)) + centerY;
+                }
+                var startPoint = new Point(arcStartX, arcStartY);
+                var line1Segment = new LineSegment(startPoint, false);
+                bool isLargeArc = item.Value / sum > 0.5;
+                var arcSegment = new ArcSegment();
+                var size = new Size(radius, radius);
+                var endPoint = new Point(arcEndX, arcEndY);
+                arcSegment.Size = size;
+                arcSegment.Point = endPoint;
+                arcSegment.SweepDirection = SweepDirection.Clockwise;
+                arcSegment.IsLargeArc = isLargeArc;
+                var center = new Point(centerX, centerY);
+                var line2Segment = new LineSegment(center, false);
+
+                var pathGeometry = new PathGeometry(new PathFigure[]
+                {
+                    new PathFigure(new Point(centerX, centerY), new List<PathSegment>()
+                    {
+                        line1Segment,
+                        arcSegment,
+                        line2Segment,
+                    }, true)
+                });
+                pathGeometries.Add(pathGeometry, $"{item.Key} : {item.Value.ToString("#,##0.#########################")}");
+                var backgroupBrush = new SolidColorBrush()
+                {
+                    Color = vibrantColors[index >= vibrantColors.Length ? index % vibrantColors.Length : index]//RandomColorGenerator.GenerateRandomColor(),
+                };
+                backgroupBrush.Freeze();
+
+                drawingContext.DrawGeometry(backgroupBrush, null, pathGeometry);
+                index++;
+                if (!isFirst)
+                {
+                    if (index == 1)
+                        drawingContext.DrawLine(boldDrawingPen, center, startPoint);
+                    else
+                        drawingContext.DrawLine(drawingPen, center, startPoint);
+                }
+                prevAngle = angle;
+            }
+
+        }
+        private Pen CreatePen(double thickness)
+        {
+            var pen = new Pen
+            {
+                Thickness = thickness,
+                Brush = Brushes.White,
+            };
+            pen.Freeze();
+            return pen;
+        }
+    }
+    public class RandomColorGenerator
+    {
+        private static Random random = new Random();
+        public static Color GenerateRandomColor()
+        {
+            byte[] rgb = new byte[3];
+            random.NextBytes(rgb);
+            var randomColor = Color.FromArgb(255, rgb[0], rgb[1], rgb[2]);
+            return randomColor;
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 53988172..9769bd4f 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -13,6 +13,7 @@
     <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\ChartPie.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRect.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRound.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />

From fe7f621cb2f4a0fbf71bfbc7fd965f278ec62efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 24 Jul 2024 23:02:39 +0800
Subject: [PATCH 028/123] Update ElementHelper.cs

---
 src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
index d257ee26..f040e1ea 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
@@ -55,6 +55,7 @@ public static void SetIsStripe(DependencyObject obj, bool value)
         {
             obj.SetValue(IsStripeProperty, value);
         }
+
         public static bool GetIsRound(DependencyObject obj)
         {
             return (bool)obj.GetValue(IsRoundProperty);
@@ -64,6 +65,7 @@ public static void SetIsRound(DependencyObject obj, bool value)
         {
             obj.SetValue(IsRoundProperty, value);
         }
+
         public static void SetIsClear(UIElement element, bool value)
         {
             element.SetValue(IsClearProperty, value);

From c0dae74bb6c4c9b2539339221d394ee680372579 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 24 Jul 2024 23:02:42 +0800
Subject: [PATCH 029/123] Update ChartLineExample.xaml.cs

---
 .../ExampleViews/ChartLineExample.xaml.cs        | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
index 6da42b8a..57da0420 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
@@ -30,19 +30,19 @@ public ChartLineExample()
                 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>("Fri", 8000.12) ,
                 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) ,
+                new KeyValuePair<string, double>("Bing", 120),
+                new KeyValuePair<string, double>("Google", 170),
+                new KeyValuePair<string, double>("Baidu", 30),
+                new KeyValuePair<string, double>("Github", 200),
+                new KeyValuePair<string, double>("Stack Overflow", 100) ,
+                new KeyValuePair<string, double>("Runoob", 180) ,
+                new KeyValuePair<string, double>("Open AI", 90) ,
             };
             keyValues.Add("1", models1);
             keyValues.Add("2", models2);

From 7bb306b8ab8bb54ac01183cb91cf84a9204a1f39 Mon Sep 17 00:00:00 2001
From: SwaggyMacro <macro@julym.com>
Date: Thu, 15 Aug 2024 15:39:08 +0800
Subject: [PATCH 030/123] Update WDMessageBox.cs

---
 src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
index 2a7532b4..54b100c0 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
@@ -217,10 +217,13 @@ private void DisplayButtons(MessageBoxButton button)
                     _okVisibility = Visibility.Visible;
                     break;
                 case MessageBoxButton.YesNo:
+                    _okVisibility = Visibility.Collapsed;
+                    _cancelVisibility = Visibility.Collapsed;
                     _yesVisibility = Visibility.Visible;
                     _noVisibility = Visibility.Visible;
                     break;
                 case MessageBoxButton.YesNoCancel:
+                    _okVisibility = Visibility.Collapsed;
                     _yesVisibility = Visibility.Visible;
                     _noVisibility = Visibility.Visible;
                     _cancelVisibility = Visibility.Visible;
@@ -258,4 +261,4 @@ private void DisplayImage(MessageBoxImage image)
             }
         }
     }
-}
\ No newline at end of file
+}

From dac14f79cb65a1164d30adfdb95d1739548855d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 22:47:24 +0800
Subject: [PATCH 031/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#105=20=20?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix issue（ #105  ）
---
 .../Controls/TimePicker/TimePicker.cs         | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
index 79e14fb3..c94a4f8c 100644
--- a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
@@ -87,6 +87,8 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
             _textBox = GetTemplateChild(EditableTextBoxTemplateName) as TextBox;
+            if (_textBox != null)
+                _textBox.TextChanged += TextBox_TextChanged;
             _timeSelector = GetTemplateChild(TimeSelectorTemplateName) as TimeSelector;
             if (_timeSelector != null)
             {
@@ -111,12 +113,25 @@ public override void OnApplyTemplate()
             }
         }
 
+        private void TextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBox != null)
+            {
+                _timeSelector.SelectedTimeChanged -= TimeSelector_SelectedTimeChanged;
+                if (DateTime.TryParse(_textBox.Text, out var dateTime))
+                {
+                    if (SelectedTime.HasValue && dateTime.ToString(SelectedTimeFormat) == SelectedTime.Value.ToString(SelectedTimeFormat)) return;
+                    SelectedTime = dateTime;
+                }
+                else
+                    SelectedTime = null;
+                _timeSelector.SelectedTimeChanged += TimeSelector_SelectedTimeChanged;
+            }
+        }
         private void Popup_Opened(object sender, EventArgs e)
         {
             if (_timeSelector != null)
-            {
                 _timeSelector.SetTime();
-            }
         }
 
         private void TimeSelector_SelectedTimeChanged(object sender, RoutedPropertyChangedEventArgs<DateTime?> e)

From 010e69ab1791b10c65dab6b9694f1b3cc54e318c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 22:48:31 +0800
Subject: [PATCH 032/123] Update SliderRepeatButton.cs

---
 .../Controls/BaseControls/SliderRepeatButton.cs  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs b/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
index fd744614..453783d2 100644
--- a/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
+++ b/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
@@ -4,17 +4,17 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class SliderRepeatButton: RepeatButton
+    public class SliderRepeatButton : RepeatButton
     {
+        public static readonly DependencyProperty RadiusOrientationProperty =
+            DependencyProperty.Register("RadiusOrientation", typeof(RadiusOrientation), typeof(SliderRepeatButton),
+                new PropertyMetadata(null));
+
         public RadiusOrientation RadiusOrientation
         {
-            get { return (RadiusOrientation)GetValue(RadiusOrientationProperty); }
-            set { SetValue(RadiusOrientationProperty, value); }
+            get => (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)]
@@ -29,4 +29,4 @@ public enum RadiusOrientation
         BottomRight,
         BottomLeft
     }
-}
+}
\ No newline at end of file

From da7bde91aeec9c9af3c1b41d7aae9da819d29e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 22:48:41 +0800
Subject: [PATCH 033/123] Update WDBorder.cs

---
 .../Controls/BaseControls/WDBorder.cs         | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs b/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
index f1aeb116..6212f3e5 100644
--- a/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
+++ b/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
@@ -7,16 +7,16 @@ namespace WPFDevelopers.Controls
 {
     public class WDBorder : Border
     {
+        public static readonly DependencyPropertyKey ContentClipPropertyKey =
+            DependencyProperty.RegisterReadOnly("ContentClip", typeof(Geometry), typeof(WDBorder),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty ContentClipProperty = ContentClipPropertyKey.DependencyProperty;
+
         public Geometry ContentClip
         {
-            get
-            {
-                return (Geometry)GetValue(ContentClipProperty);
-            }
-            set
-            {
-                SetValue(ContentClipProperty, value);
-            }
+            get => (Geometry) GetValue(ContentClipProperty);
+            set => SetValue(ContentClipProperty, value);
         }
 
         private Geometry CalculateContentClip()
@@ -31,13 +31,14 @@ private Geometry CalculateContentClip()
                 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())
+                using (var streamGeometryContext = streamGeometry.Open())
                 {
                     GeometryHelper.GenerateGeometry(streamGeometryContext, rect, radii);
                     streamGeometry.Freeze();
                     return streamGeometry;
                 }
             }
+
             return null;
         }
 
@@ -46,11 +47,5 @@ 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;
-        
     }
-}
+}
\ No newline at end of file

From ba822ba39a16703d5aa0e173e35bfa24b46f5663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 22:51:16 +0800
Subject: [PATCH 034/123] Update WDMessageBox.cs

---
 src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
index 54b100c0..fe03db52 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
@@ -215,6 +215,8 @@ private void DisplayButtons(MessageBoxButton button)
                 case MessageBoxButton.OKCancel:
                     _cancelVisibility = Visibility.Visible;
                     _okVisibility = Visibility.Visible;
+                    _yesVisibility = Visibility.Collapsed;
+                    _noVisibility = Visibility.Collapsed;
                     break;
                 case MessageBoxButton.YesNo:
                     _okVisibility = Visibility.Collapsed;
@@ -229,6 +231,9 @@ private void DisplayButtons(MessageBoxButton button)
                     _cancelVisibility = Visibility.Visible;
                     break;
                 default:
+                    _cancelVisibility = Visibility.Collapsed;
+                    _yesVisibility = Visibility.Collapsed;
+                    _noVisibility = Visibility.Collapsed;
                     _okVisibility = Visibility.Visible;
                     break;
             }

From e002c89ccd0fa2d6ddbca5338ff263e42e8bff57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 23:25:25 +0800
Subject: [PATCH 035/123] Update TimeSelector.cs

---
 src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs
index cc88bed2..b2205d76 100644
--- a/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimeSelector.cs
@@ -186,20 +186,16 @@ public void SetTime()
             _listBoxHour.SelectionChanged -= ListBoxHour_SelectionChanged;
             var hour = _hour.ToString("D2");
             _listBoxHour.SelectedItem = hour;
-            //(_listBoxHour as TimeSelectorListBox).Positioning();
             _listBoxHour.SelectionChanged += ListBoxHour_SelectionChanged;
 
-
             _listBoxMinute.SelectionChanged -= ListBoxMinute_SelectionChanged;
             var minute = _minute.ToString("D2");
             _listBoxMinute.SelectedItem = minute;
-            //(_listBoxMinute as TimeSelectorListBox).Positioning();
             _listBoxMinute.SelectionChanged += ListBoxMinute_SelectionChanged;
 
             _listBoxSecond.SelectionChanged -= ListBoxSecond_SelectionChanged;
             var second = _second.ToString("D2");
             _listBoxSecond.SelectedItem = second;
-            //(_listBoxSecond as TimeSelectorListBox).Positioning();
             _listBoxSecond.SelectionChanged += ListBoxSecond_SelectionChanged;
 
             SetSelectedTime();

From 88835427c56d332029cb06af5909b3121d664be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 23:27:24 +0800
Subject: [PATCH 036/123] =?UTF-8?q?Fix=20issue=EF=BC=88=20#105=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Optimize updates：Add empty time @loveyou3thousand
---
 .../Controls/TimePicker/TimePicker.cs               | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
index c94a4f8c..368eed56 100644
--- a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
@@ -73,13 +73,20 @@ protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newVal
         private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var ctrl = d as TimePicker;
-            if (ctrl != null && e.NewValue != null)
+            if (ctrl != null)
             {
-                var dateTime = (DateTime) e.NewValue;
+                DateTime? dateTime = DateTime.MinValue;
+                if (e.NewValue != null)
+                    dateTime = (DateTime)e.NewValue;
                 if (ctrl._timeSelector != null && dateTime > DateTime.MinValue)
                     ctrl._timeSelector.SelectedTime = dateTime;
                 else
-                    ctrl._date = dateTime;
+                {
+                    if(ctrl._timeSelector != null)
+                        ctrl._timeSelector.SelectedTime = null;
+                    else
+                        ctrl._date = dateTime.Value;
+                }
             }
         }
 

From aabe5c09a8a0e2b40e2186027069356effc73563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 19 Aug 2024 23:27:34 +0800
Subject: [PATCH 037/123] Update TimePickerExample.xaml

---
 .../ExampleViews/TimePickerExample.xaml                          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
index e769c22b..88f0c215 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
@@ -23,6 +23,7 @@
             <wd:TimePicker
                 Width="200"
                 VerticalAlignment="Center"
+                wd:ElementHelper.Watermark="selection time"
                 SelectedTime="2023-05-06 23:59:59" />
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>

From e5f57238b0f073fa735ac9b67ab250b9421acfb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sat, 24 Aug 2024 22:59:16 +0800
Subject: [PATCH 038/123] Update LoadingGroup.xaml

---
 .../Themes/LoadingGroup.xaml                  | 200 +++++++++---------
 1 file changed, 103 insertions(+), 97 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
index 5ca3cdb4..062a9874 100644
--- a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
+++ b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
@@ -12,11 +12,9 @@
         TargetType="{x:Type controls:StreamerLoading}">
         <Setter Property="Width" Value="100" />
         <Setter Property="Height" Value="100" />
-        <Setter Property="Background">
-            <Setter.Value>
-                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-            </Setter.Value>
-        </Setter>
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
@@ -24,8 +22,9 @@
                         x:Name="PART_Rectangle"
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        CacheMode="BitmapCache"
                         StrokeThickness="3">
                         <Rectangle.Stroke>
                             <LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
@@ -35,26 +34,28 @@
                         </Rectangle.Stroke>
                     </Rectangle>
                     <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="Loaded">
-                            <BeginStoryboard>
-                                <Storyboard RepeatBehavior="Forever">
-                                    <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
-                                        <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
-                                        <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
-                                        <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
-                                        <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
-                                        <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
-                                    </PointAnimationUsingKeyFrames>
-                                    <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
-                                        <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
-                                        <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
-                                        <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
-                                        <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
-                                        <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
-                                    </PointAnimationUsingKeyFrames>
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
+                        <Trigger Property="IsVisible" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard DesiredFrameRate="30" RepeatBehavior="Forever">
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
+                                        </PointAnimationUsingKeyFrames>
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
+                                        </PointAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -67,7 +68,10 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:WaitLoading}">
-                    <Canvas Width="100" Height="20">
+                    <Canvas
+                        Width="100"
+                        Height="20"
+                        CacheMode="BitmapCache">
                         <Ellipse
                             x:Name="PART_RedEllipase"
                             Canvas.Left="0"
@@ -88,72 +92,74 @@
                             Fill="{StaticResource WD.WarningSolidColorBrush}" />
                     </Canvas>
                     <ControlTemplate.Triggers>
-                        <EventTrigger RoutedEvent="Loaded">
-                            <BeginStoryboard>
-                                <Storyboard RepeatBehavior="Forever">
-                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:0.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:1"
-                                            Value="100" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:1.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:3"
-                                            Value="0" />
-                                    </DoubleAnimationUsingKeyFrames>
-                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                        <EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:1"
-                                            Value="0" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:1.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:2"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:2.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
-                                    </DoubleAnimationUsingKeyFrames>
-                                    <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:0.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
-                                        <EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:2"
-                                            Value="0" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:2.5"
-                                            Value="50" />
-                                        <EasingDoubleKeyFrame
-                                            EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                            KeyTime="0:0:3"
-                                            Value="100" />
-                                    </DoubleAnimationUsingKeyFrames>
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
+                        <Trigger Property="IsVisible" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard RepeatBehavior="Forever">
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:0.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:1"
+                                                Value="100" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:1.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:3"
+                                                Value="0" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                            <EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:1"
+                                                Value="0" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:1.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:2"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:2.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:0.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
+                                            <EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:2"
+                                                Value="0" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:2.5"
+                                                Value="50" />
+                                            <EasingDoubleKeyFrame
+                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                                KeyTime="0:0:3"
+                                                Value="100" />
+                                        </DoubleAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                        </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -191,7 +197,7 @@
                                 Duration="0:0:5" />
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <controls:SmallPanel>
+                    <controls:SmallPanel CacheMode="BitmapCache">
                         <Viewbox>
                             <controls:SmallPanel Width="400" Height="400">
                                 <controls:SmallPanel x:Name="Part_Cycle_Rotate1" RenderTransformOrigin="0.5,0.5">
@@ -423,7 +429,7 @@
                             </ColorAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid>
+                    <Grid CacheMode="BitmapCache">
                         <Grid.RowDefinitions>
                             <RowDefinition />
                             <RowDefinition Height="Auto" />
@@ -669,7 +675,7 @@
                                 Duration="0:0:1.5" />
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <Grid>
+                    <Grid CacheMode="BitmapCache">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="*" />
                             <RowDefinition Height="Auto" />

From 5dbf533baa6888c40b00f5d270a50ef885080b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:21:52 +0800
Subject: [PATCH 039/123] Create StreamerLoading

---
 .../Controls/Loadings/StreamerLoading.cs      |  2 +-
 .../Controls/Loadings/StreamerLoading.xaml    | 66 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 rename src/{WPFDevelopers.Shared => WPFDevelopers.Samples.Shared}/Controls/Loadings/StreamerLoading.cs (88%)
 create mode 100644 src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/StreamerLoading.cs b/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.cs
similarity index 88%
rename from src/WPFDevelopers.Shared/Controls/Loadings/StreamerLoading.cs
rename to src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.cs
index f90c3cc2..2bddeedd 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/StreamerLoading.cs
+++ b/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.cs
@@ -1,7 +1,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace WPFDevelopers.Controls
+namespace WPFDevelopers.Samples.Controls
 {
     public class StreamerLoading : Control
     {
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml b/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml
new file mode 100644
index 00000000..e6db041a
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/Controls/Loadings/StreamerLoading.xaml
@@ -0,0 +1,66 @@
+<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">
+    <Style
+        x:Key="WD.StreamerLoading"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:StreamerLoading}">
+        <Setter Property="Width" Value="100" />
+        <Setter Property="Height" Value="100" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Background">
+            <Setter.Value>
+                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
+                    <Rectangle
+                        x:Name="PART_Rectangle"
+                        Width="{TemplateBinding Width}"
+                        Height="{TemplateBinding Height}"
+                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                        CacheMode="BitmapCache"
+                        StrokeThickness="3">
+                        <Rectangle.Stroke>
+                            <LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
+                                <GradientStop Offset="0" Color="Transparent" />
+                                <GradientStop Offset="1" Color="{Binding Path=Background.Color, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </LinearGradientBrush>
+                        </Rectangle.Stroke>
+                    </Rectangle>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsVisible" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard DesiredFrameRate="30" RepeatBehavior="Forever">
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
+                                        </PointAnimationUsingKeyFrames>
+                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
+                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
+                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
+                                        </PointAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.StreamerLoading}" TargetType="{x:Type controls:StreamerLoading}" />
+</ResourceDictionary>
\ No newline at end of file

From ab6f3db813dd04433d080e3b6e88eb692e09cff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:00 +0800
Subject: [PATCH 040/123] Update WaitLoadingExample.xaml

---
 .../Loading/WaitLoadingExample.xaml           | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
index 38daba47..94b6e23e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
@@ -1,21 +1,22 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.WaitLoadingExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.WaitLoadingExample"
+    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: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>
-        <wd:WaitLoading/>
+        <StackPanel>
+            <CheckBox x:Name="MyCheckBox" Content="IsLoading" />
+            <wd:WaitLoading HorizontalAlignment="Center" IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}" />
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/WaitLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/WaitLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/WaitLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/WaitLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 8f1e4d26c87931e46b23384ddc752f4b2024736f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:02 +0800
Subject: [PATCH 041/123] Update StreamerLoadingExample.xaml

---
 .../Loading/StreamerLoadingExample.xaml       | 54 +++++++++++--------
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
index e62bfa6f..d08d9f5d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
@@ -1,25 +1,37 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.StreamerLoadingExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.StreamerLoadingExample"
+    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: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>
-        <wd:StreamerLoading>
-            <wd:StreamerLoading.Background>
-                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}"/>
-            </wd:StreamerLoading.Background>
-        </wd:StreamerLoading>
+        <StackPanel>
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsVisible" />
+            <controls:StreamerLoading Visibility="{Binding ElementName=MyCheckBox, Path=IsChecked, Converter={StaticResource WD.Bool2VisibilityConverter}}">
+                <controls:StreamerLoading.Background>
+                    <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
+                </controls:StreamerLoading.Background>
+            </controls:StreamerLoading>
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/StreamerLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/StreamerLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel
+                CodeSource="/WPFDevelopers.SamplesCode;component/Controls/Loadings/StreamerLoading.cs"
+                CodeType="CSharp"
+                Haader="StreamerCSharp" />
+            <controls:SourceCodeModel
+                CodeSource="/WPFDevelopers.SamplesCode;component/Controls/Loadings/StreamerLoading.xaml"
+                CodeType="Xaml"
+                Haader="StreamerXaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/StreamerLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/StreamerLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
-        </controls:CodeViewer>
+    </controls:CodeViewer>
 </UserControl>

From c6f9308eac591209b27d24ced4cc0a87df950c52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:05 +0800
Subject: [PATCH 042/123] Update RollLoadingExample.xaml

---
 .../Loading/RollLoadingExample.xaml           | 47 ++++++++++---------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
index ac2df61c..fa45b205 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
@@ -1,26 +1,31 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.RollLoadingExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.RollLoadingExample"
+    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: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>
-        <wd:RollLoading IsStart="true" 
-                            HorizontalContentAlignment="Center" 
-                            VerticalContentAlignment="Center"
-                            Width="200">
-            <TextBlock Text="Loading activity..."/>
-        </wd:RollLoading>
+        <StackPanel>
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsLoading" />
+            <wd:RollLoading
+                Width="200"
+                HorizontalContentAlignment="Center"
+                VerticalContentAlignment="Center"
+                IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}">
+                <TextBlock Text="Loading activity..." />
+            </wd:RollLoading>
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RollLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RollLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RollLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RollLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 4ad39886f29fcd767454d6a4751092c4466de92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:09 +0800
Subject: [PATCH 043/123] Update RingLoadingExample.xaml

---
 .../Loading/RingLoadingExample.xaml           | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
index 14f07466..b88cca0d 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
@@ -1,24 +1,32 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.RingLoadingExample"
-             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:wd="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">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.RingLoadingExample"
+    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>
-        <wd:RingLoading IsStart="true" 
-                            Width="400" Height="400"
-                            Description="WPFDevelopers" Foreground="Black" ProgressValue="50"/>
+        <StackPanel>
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsLoading" />
+            <wd:RingLoading
+                Width="400"
+                Height="400"
+                Description="WPFDevelopers"
+                Foreground="Black"
+                IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                ProgressValue="50" />
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RingLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RingLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RingLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RingLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 47687edbaed30d35c21f2b7ab100701d8fce5eb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:12 +0800
Subject: [PATCH 044/123] Update CycleLoadingExample.xaml

---
 .../Loading/CycleLoadingExample.xaml          | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
index 2f7664b8..a3987a35 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
@@ -1,23 +1,31 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.CycleLoadingExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.CycleLoadingExample"
+    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: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>
-        <wd:CycleLoading  Value="50" LoadTitle="Loading...." Width="200">
-            <TextBlock Text="activity"/>
-        </wd:CycleLoading>
+        <StackPanel>
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsLoading" />
+            <wd:CycleLoading
+                Width="200"
+                IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}"
+                LoadTitle="Loading...."
+                Value="50">
+                <TextBlock Text="activity" />
+            </wd:CycleLoading>
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/CycleLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/CycleLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/CycleLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/CycleLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From a0a1fda0e202855fd42aae0ae600f8110112c348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:14 +0800
Subject: [PATCH 045/123] Update BallLoadingExample.xaml

---
 .../Loading/BallLoadingExample.xaml           | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
index 325a96a8..f484f9ab 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
@@ -1,21 +1,25 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.BallLoadingExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.BallLoadingExample"
+    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: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>
-        <wd:BallLoading Width="200"/>
+        <StackPanel>
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsLoading" />
+            <wd:BallLoading Width="200" IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}" />
+        </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/BallLoadingExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/BallLoadingExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/BallLoadingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/BallLoadingExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From a2c07f06adc532cb5a12077e5574dbe67d470c67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:21 +0800
Subject: [PATCH 046/123] Update LoadingGroup.xaml

---
 .../Themes/LoadingGroup.xaml                  | 333 ++++++------------
 1 file changed, 114 insertions(+), 219 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
index 062a9874..965d0de3 100644
--- a/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
+++ b/src/WPFDevelopers.Shared/Themes/LoadingGroup.xaml
@@ -6,61 +6,7 @@
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="Basic/Animations.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style
-        x:Key="WD.StreamerLoading"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:StreamerLoading}">
-        <Setter Property="Width" Value="100" />
-        <Setter Property="Height" Value="100" />
-        <Setter Property="HorizontalAlignment" Value="Center" />
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
-                    <Rectangle
-                        x:Name="PART_Rectangle"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                        VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                        CacheMode="BitmapCache"
-                        StrokeThickness="3">
-                        <Rectangle.Stroke>
-                            <LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
-                                <GradientStop Offset="0" Color="Transparent" />
-                                <GradientStop Offset="1" Color="{Binding Path=Background.Color, RelativeSource={RelativeSource TemplatedParent}}" />
-                            </LinearGradientBrush>
-                        </Rectangle.Stroke>
-                    </Rectangle>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsVisible" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard DesiredFrameRate="30" RepeatBehavior="Forever">
-                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
-                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
-                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
-                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
-                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
-                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
-                                        </PointAnimationUsingKeyFrames>
-                                        <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
-                                            <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
-                                            <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
-                                            <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
-                                            <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
-                                            <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
-                                        </PointAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </Trigger.EnterActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+
     <Style
         x:Key="WD.WaitLoading"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
@@ -68,6 +14,73 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:WaitLoading}">
+                    <ControlTemplate.Resources>
+                        <Storyboard
+                            x:Key="PART_Storyboard"
+                            DesiredFrameRate="30"
+                            RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:0.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:1"
+                                    Value="100" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:1.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:3"
+                                    Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:1"
+                                    Value="0" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:1.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:2"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:2.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:0.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:2"
+                                    Value="0" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:2.5"
+                                    Value="50" />
+                                <EasingDoubleKeyFrame
+                                    EasingFunction="{StaticResource WD.PowerEaseInOut}"
+                                    KeyTime="0:0:3"
+                                    Value="100" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
                     <Canvas
                         Width="100"
                         Height="20"
@@ -92,73 +105,13 @@
                             Fill="{StaticResource WD.WarningSolidColorBrush}" />
                     </Canvas>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsVisible" Value="True">
+                        <Trigger Property="IsLoading" Value="True">
                             <Trigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard RepeatBehavior="Forever">
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:0.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:1"
-                                                Value="100" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:1.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
-                                            <EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:3"
-                                                Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                            <EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:1"
-                                                Value="0" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:1.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:2"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:2.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:0.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
-                                            <EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:2"
-                                                Value="0" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:2.5"
-                                                Value="50" />
-                                            <EasingDoubleKeyFrame
-                                                EasingFunction="{StaticResource WD.PowerEaseInOut}"
-                                                KeyTime="0:0:3"
-                                                Value="100" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
+                                <BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
                             </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
+                            </Trigger.ExitActions>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -179,19 +132,20 @@
                     <ControlTemplate.Resources>
                         <Storyboard
                             x:Key="Storyboard_LoadRunning"
+                            DesiredFrameRate="30"
                             RepeatBehavior="Forever"
                             SpeedRatio="2">
                             <DoubleAnimation
                                 BeginTime="0"
                                 Storyboard.TargetName="Part_Cycle_Rotate"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
                             <DoubleAnimation
                                 BeginTime="0"
                                 Storyboard.TargetName="Part_Cycle_Rotate1"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -202,12 +156,7 @@
                             <controls:SmallPanel Width="400" Height="400">
                                 <controls:SmallPanel x:Name="Part_Cycle_Rotate1" RenderTransformOrigin="0.5,0.5">
                                     <controls:SmallPanel.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </controls:SmallPanel.RenderTransform>
                                     <Ellipse Margin="0,50,0,50">
                                         <Ellipse.Fill>
@@ -234,12 +183,7 @@
                                 </controls:SmallPanel>
                                 <controls:SmallPanel x:Name="Part_Cycle_Rotate" RenderTransformOrigin="0.5,0.5">
                                     <controls:SmallPanel.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </controls:SmallPanel.RenderTransform>
                                     <Ellipse Margin="0,50,0,50">
                                         <Ellipse.Fill>
@@ -303,7 +247,7 @@
                         </Grid>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsStart" Value="True">
+                        <Trigger Property="IsLoading" Value="True">
                             <Trigger.EnterActions>
                                 <BeginStoryboard x:Name="Storyboard_LoadRunning" Storyboard="{StaticResource Storyboard_LoadRunning}" />
                             </Trigger.EnterActions>
@@ -325,13 +269,16 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:RollLoading}">
                     <ControlTemplate.Resources>
-                        <Storyboard x:Key="RollKey" RepeatBehavior="Forever">
+                        <Storyboard
+                            x:Key="PART_Storyboard"
+                            DesiredFrameRate="30"
+                            RepeatBehavior="Forever">
                             <DoubleAnimation
                                 BeginTime="0"
                                 RepeatBehavior="Forever"
                                 SpeedRatio="2"
                                 Storyboard.TargetName="PART_Border1"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -340,7 +287,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="4"
                                 Storyboard.TargetName="PART_Border2"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -349,7 +296,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="6"
                                 Storyboard.TargetName="PART_Border3"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -358,7 +305,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="8"
                                 Storyboard.TargetName="PART_Border4"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -367,7 +314,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="10"
                                 Storyboard.TargetName="PART_Border5"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -376,7 +323,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="12"
                                 Storyboard.TargetName="PART_Border6"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -385,7 +332,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="14"
                                 Storyboard.TargetName="PART_Border7"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -394,7 +341,7 @@
                                 RepeatBehavior="Forever"
                                 SpeedRatio="16"
                                 Storyboard.TargetName="PART_Border8"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 From="0"
                                 To="360"
                                 Duration="0:0:5" />
@@ -452,12 +399,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -476,12 +418,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -500,12 +437,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -524,12 +456,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -548,12 +475,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -572,12 +494,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -596,12 +513,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                                 <Border
@@ -620,12 +532,7 @@
                                         </LinearGradientBrush>
                                     </Border.BorderBrush>
                                     <Border.RenderTransform>
-                                        <TransformGroup>
-                                            <ScaleTransform />
-                                            <SkewTransform />
-                                            <RotateTransform />
-                                            <TranslateTransform />
-                                        </TransformGroup>
+                                        <RotateTransform />
                                     </Border.RenderTransform>
                                 </Border>
                             </controls:SmallPanel>
@@ -636,9 +543,9 @@
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsStart" Value="True">
+                        <Trigger Property="IsLoading" Value="True">
                             <Trigger.EnterActions>
-                                <BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource RollKey}" />
+                                <BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource PART_Storyboard}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <StopStoryboard BeginStoryboardName="Roll_Storyboard" />
@@ -657,20 +564,23 @@
             <Setter.Value>
                 <ControlTemplate TargetType="controls:RingLoading">
                     <ControlTemplate.Resources>
-                        <Storyboard x:Key="PART_Resource_Storyboard" RepeatBehavior="Forever">
+                        <Storyboard
+                            x:Key="PART_Storyboard"
+                            DesiredFrameRate="30"
+                            RepeatBehavior="Forever">
                             <DoubleAnimation
                                 Storyboard.TargetName="PART_Ring1"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 To="-495"
                                 Duration="0:0:1.5" />
                             <DoubleAnimation
                                 Storyboard.TargetName="PART_Ring2"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 To="585"
                                 Duration="0:0:1.5" />
                             <DoubleAnimation
                                 Storyboard.TargetName="PART_Ring3"
-                                Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
                                 To="-315"
                                 Duration="0:0:1.5" />
                         </Storyboard>
@@ -694,12 +604,7 @@
                                         VerticalAlignment="Top"
                                         RenderTransformOrigin="0.5,0.5">
                                         <controls:SmallPanel.RenderTransform>
-                                            <TransformGroup>
-                                                <ScaleTransform />
-                                                <SkewTransform />
-                                                <RotateTransform Angle="-135" />
-                                                <TranslateTransform />
-                                            </TransformGroup>
+                                            <RotateTransform Angle="-135" />
                                         </controls:SmallPanel.RenderTransform>
                                         <Ellipse
                                             RenderTransformOrigin="0.5,0.5"
@@ -729,12 +634,7 @@
                                         VerticalAlignment="Bottom"
                                         RenderTransformOrigin="0.5,0.5">
                                         <controls:SmallPanel.RenderTransform>
-                                            <TransformGroup>
-                                                <ScaleTransform />
-                                                <SkewTransform />
-                                                <RotateTransform Angle="225" />
-                                                <TranslateTransform />
-                                            </TransformGroup>
+                                            <RotateTransform Angle="225" />
                                         </controls:SmallPanel.RenderTransform>
                                         <Ellipse
                                             Stroke="Purple"
@@ -764,12 +664,7 @@
                                         VerticalAlignment="Bottom"
                                         RenderTransformOrigin="0.5,0.5">
                                         <controls:SmallPanel.RenderTransform>
-                                            <TransformGroup>
-                                                <ScaleTransform />
-                                                <SkewTransform />
-                                                <RotateTransform Angle="45" />
-                                                <TranslateTransform />
-                                            </TransformGroup>
+                                            <RotateTransform Angle="45" />
                                         </controls:SmallPanel.RenderTransform>
                                         <Ellipse
                                             Stroke="#0fb8b2"
@@ -813,9 +708,9 @@
                         </StackPanel>
                     </Grid>
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsStart" Value="True">
+                        <Trigger Property="IsLoading" Value="True">
                             <Trigger.EnterActions>
-                                <BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Resource_Storyboard}" />
+                                <BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
                             </Trigger.EnterActions>
                             <Trigger.ExitActions>
                                 <StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
@@ -826,7 +721,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style BasedOn="{StaticResource WD.StreamerLoading}" TargetType="{x:Type controls:StreamerLoading}" />
+
     <Style BasedOn="{StaticResource WD.WaitLoading}" TargetType="{x:Type controls:WaitLoading}" />
     <Style BasedOn="{StaticResource WD.CycleLoading}" TargetType="{x:Type controls:CycleLoading}" />
     <Style BasedOn="{StaticResource WD.RollLoading}" TargetType="{x:Type controls:RollLoading}" />

From 8f256db21c3e8ff407a03f8e422b579e71f312d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:26 +0800
Subject: [PATCH 047/123] Update WaitLoading.cs

---
 src/WPFDevelopers.Shared/Controls/Loadings/WaitLoading.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/WaitLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/WaitLoading.cs
index 728ce395..883b9416 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/WaitLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/WaitLoading.cs
@@ -3,7 +3,7 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class WaitLoading : Control
+    public class WaitLoading : LoadingBase
     {
         static WaitLoading()
         {

From e35a3fdccf09cca9dd60af5a768024e7ad2767a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:29 +0800
Subject: [PATCH 048/123] Update RollLoading.cs

---
 .../Controls/Loadings/RollLoading.cs              | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/RollLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/RollLoading.cs
index c6a9ba3a..a7c7aa8c 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/RollLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/RollLoading.cs
@@ -4,35 +4,24 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class RollLoading : ContentControl
+    public class RollLoading : LoadingBase
     {
         public static readonly DependencyProperty ForegroundColorProperty =
             DependencyProperty.Register("ForegroundColor", typeof(Color), typeof(RollLoading),
                 new PropertyMetadata(Colors.Red));
 
-        public static readonly DependencyProperty IsStartProperty =
-            DependencyProperty.Register("IsStart", typeof(bool), typeof(RollLoading), new PropertyMetadata(true));
-
         static RollLoading()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(RollLoading),
                 new FrameworkPropertyMetadata(typeof(RollLoading)));
         }
 
-
         public Color ForegroundColor
         {
             get => (Color)GetValue(ForegroundColorProperty);
             set => SetValue(ForegroundColorProperty, value);
         }
-
-
-        public bool IsStart
-        {
-            get => (bool)GetValue(IsStartProperty);
-            set => SetValue(IsStartProperty, value);
-        }
-
+        
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();

From b38c87a83c0b3cdc35ae4d56fdbc00e525b616fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:32 +0800
Subject: [PATCH 049/123] Update RingLoading.cs

---
 .../Controls/Loadings/RingLoading.cs          | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/RingLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/RingLoading.cs
index b75869e6..9e8f1388 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/RingLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/RingLoading.cs
@@ -3,10 +3,10 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class RingLoading : Control
+    public class RingLoading : LoadingBase
     {
-        public static readonly DependencyProperty IsStartProperty =
-            DependencyProperty.Register("IsStart", typeof(bool), typeof(RingLoading), new PropertyMetadata(default));
+        //public static readonly DependencyProperty IsStartProperty =
+        //    DependencyProperty.Register("IsStart", typeof(bool), typeof(RingLoading), new PropertyMetadata(default));
 
         public static readonly DependencyProperty ProgressValueProperty =
             DependencyProperty.Register("ProgressValue", typeof(double), typeof(RingLoading),
@@ -29,11 +29,11 @@ static RingLoading()
                 new FrameworkPropertyMetadata(typeof(RingLoading)));
         }
 
-        public bool IsStart
-        {
-            get => (bool)GetValue(IsStartProperty);
-            set => SetValue(IsStartProperty, value);
-        }
+        //public bool IsStart
+        //{
+        //    get => (bool)GetValue(IsStartProperty);
+        //    set => SetValue(IsStartProperty, value);
+        //}
 
 
         public double ProgressValue
@@ -66,10 +66,8 @@ private static void OnProgressValueChangedCallBack(DependencyObject d, Dependenc
         {
             if (!(d is RingLoading control))
                 return;
-
             if (!double.TryParse(e.NewValue?.ToString(), out var value))
                 return;
-
             var progress = value / control.Maximum;
             control.SetCurrentValue(ProgressProperty, progress.ToString("P0"));
         }
@@ -78,13 +76,10 @@ private static void OnMaximumPropertyChangedCallBack(DependencyObject d, Depende
         {
             if (!(d is RingLoading control))
                 return;
-
             if (!double.TryParse(e.NewValue?.ToString(), out var maxValue))
                 return;
-
             if (maxValue <= 0)
                 return;
-
             var progress = control.ProgressValue / maxValue;
             control.SetCurrentValue(ProgressProperty, progress.ToString("P0"));
         }

From 61c201a05557683cbcbcd58b710c62edc32ff794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:35 +0800
Subject: [PATCH 050/123] Create LoadingBase.cs

---
 .../Controls/Loadings/LoadingBase.cs          | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 src/WPFDevelopers.Shared/Controls/Loadings/LoadingBase.cs

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/LoadingBase.cs b/src/WPFDevelopers.Shared/Controls/Loadings/LoadingBase.cs
new file mode 100644
index 00000000..b849a75f
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/LoadingBase.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Controls
+{
+    public abstract class LoadingBase:ContentControl
+    {
+        public bool IsLoading
+        {
+            get { return (bool)GetValue(IsLoadingProperty); }
+            set { SetValue(IsLoadingProperty, value); }
+        }
+
+        public static readonly DependencyProperty IsLoadingProperty =
+            DependencyProperty.Register("IsLoading", typeof(bool), typeof(LoadingBase), new FrameworkPropertyMetadata(
+                true,
+                FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
+                OnIsLoadingChanged,
+                CoerceIsLoading));
+
+        private static void OnIsLoadingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = (LoadingBase)d;
+            ctrl.OnIsLoadingChanged((bool)e.OldValue, (bool)e.NewValue);
+        }
+        private static object CoerceIsLoading(DependencyObject d, object baseValue)
+        {
+            return baseValue;
+        }
+        protected virtual void OnIsLoadingChanged(bool oldValue, bool newValue)
+        {
+        }
+    }   
+}

From da9b13abe8f27a306167785f8dc1d5991960c7c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:38 +0800
Subject: [PATCH 051/123] Update CycleLoading.cs

---
 .../Controls/Loadings/CycleLoading.cs         | 33 +++++++------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
index f1cee32a..e1e7bac1 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/CycleLoading.cs
@@ -3,7 +3,7 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class CycleLoading : ContentControl
+    public class CycleLoading : LoadingBase
     {
         public static readonly DependencyProperty MaxValueProperty =
             DependencyProperty.Register("MaxValue", typeof(double), typeof(CycleLoading), new PropertyMetadata(100d));
@@ -16,8 +16,8 @@ public class CycleLoading : ContentControl
             DependencyProperty.Register("ValueDescription", typeof(string), typeof(CycleLoading),
                 new PropertyMetadata(default(string)));
 
-        public static readonly DependencyProperty IsStartProperty =
-            DependencyProperty.Register("IsStart", typeof(bool), typeof(CycleLoading), new PropertyMetadata(true));
+        //public static readonly DependencyProperty IsStartProperty =
+        //    DependencyProperty.Register("IsStart", typeof(bool), typeof(CycleLoading), new PropertyMetadata(true));
 
         public static readonly DependencyProperty LoadTitleProperty =
             DependencyProperty.Register("LoadTitle", typeof(string), typeof(CycleLoading),
@@ -29,33 +29,29 @@ static CycleLoading()
                 new FrameworkPropertyMetadata(typeof(CycleLoading)));
         }
 
-
         public double MaxValue
         {
             get => (double)GetValue(MaxValueProperty);
             set => SetValue(MaxValueProperty, value);
         }
 
-
         public double Value
         {
             get => (double)GetValue(ValueProperty);
             set => SetValue(ValueProperty, value);
         }
 
-
         internal string ValueDescription
         {
             get => (string)GetValue(ValueDescriptionProperty);
             set => SetValue(ValueDescriptionProperty, value);
         }
 
-        public bool IsStart
-        {
-            get => (bool)GetValue(IsStartProperty);
-            set => SetValue(IsStartProperty, value);
-        }
-
+        //public bool IsStart
+        //{
+        //    get => (bool)GetValue(IsStartProperty);
+        //    set => SetValue(IsStartProperty, value);
+        //}
 
         public string LoadTitle
         {
@@ -68,28 +64,23 @@ public override void OnApplyTemplate()
             base.OnApplyTemplate();
         }
 
-
         private static void OnValuePropertyChangedCallBack(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (!(d is CycleLoading loading))
                 return;
-
             if (!double.TryParse(e.NewValue?.ToString(), out var value))
                 return;
-
             if (value >= loading.MaxValue)
             {
                 value = loading.MaxValue;
-
-                if (loading.IsStart)
-                    loading.IsStart = false;
+                if (loading.IsLoading)
+                    loading.IsLoading = false;
             }
             else
             {
-                if (!loading.IsStart)
-                    loading.IsStart = true;
+                if (!loading.IsLoading)
+                    loading.IsLoading = true;
             }
-
             var dValue = value / loading.MaxValue;
             loading.ValueDescription = dValue.ToString("P0");
         }

From 78ff01a8c4ac268b3f2c96f8f9fa9e9f9ce25365 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 25 Aug 2024 00:22:42 +0800
Subject: [PATCH 052/123] Update BallLoading.cs

---
 .../Controls/Loadings/BallLoading.cs          | 264 ++++--------------
 1 file changed, 54 insertions(+), 210 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Loadings/BallLoading.cs b/src/WPFDevelopers.Shared/Controls/Loadings/BallLoading.cs
index 8638f67e..c741b6eb 100644
--- a/src/WPFDevelopers.Shared/Controls/Loadings/BallLoading.cs
+++ b/src/WPFDevelopers.Shared/Controls/Loadings/BallLoading.cs
@@ -18,7 +18,7 @@ namespace WPFDevelopers.Controls
     [TemplatePart(Name = Part_Eillipse3TemplateName, Type = typeof(Ellipse))]
     [TemplatePart(Name = Part_EillpseDock4TemplateName, Type = typeof(SmallPanel))]
     [TemplatePart(Name = Part_Eillipse4TemplateName, Type = typeof(Ellipse))]
-    public class BallLoading : Control
+    public class BallLoading : LoadingBase
     {
         private const string Part_BackGridTemplateName = "Part_BackGrid";
         private const string Part_EillipseTemplateName = "Part_Eillipse";
@@ -30,35 +30,19 @@ public class BallLoading : Control
         private const string Part_Eillipse3TemplateName = "Part_Eillipse3";
         private const string Part_EillpseDock4TemplateName = "Part_EillpseDock4";
         private const string Part_Eillipse4TemplateName = "Part_Eillipse4";
-
         private const int _nBallCount = 5;
-
-        public static readonly DependencyProperty IsStartAnimationProperty =
-            DependencyProperty.Register("IsStartAnimation", typeof(bool), typeof(BallLoading),
-                new PropertyMetadata(true, OnPropertyChangedCallback));
-
         private readonly int _AnimationSlowTime = 500;
-
         private double _BallFrom;
-
         private readonly double _BallSize = 40;
         private double _BallTo;
-
         private bool _bLoadedAnimation;
-
-        private bool _IsStart;
-
         private readonly Dictionary<int, Tuple<Color, Color>> _mapBallColors =
             new Dictionary<int, Tuple<Color, Color>>();
-
         private readonly int _OffsetTime = 1;
-
         private readonly int _SingleAnimationTime = 4;
-
+        private bool _isLoading;
         private Storyboard _Storyboard;
-
         private Storyboard _Storyboard1;
-
         private SmallPanel Part_BackGrid;
         private Ellipse Part_Eillipse;
         private Ellipse Part_Eillipse1;
@@ -82,13 +66,6 @@ public BallLoading()
             Unloaded += BallLoading_Unloaded;
         }
 
-
-        public bool IsStartAnimation
-        {
-            get => (bool)GetValue(IsStartAnimationProperty);
-            set => SetValue(IsStartAnimationProperty, value);
-        }
-
         public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
@@ -109,37 +86,27 @@ private void BallLoading_Loaded(object sender, RoutedEventArgs e)
             LoadingProcedure();
         }
 
-
         private void BallLoading_Unloaded(object sender, RoutedEventArgs e)
         {
             Close();
         }
 
-        private static void OnPropertyChangedCallback(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        protected override void OnIsLoadingChanged(bool oldValue, bool newValue)
         {
-            if (d == null)
-                return;
-
-            if (d is BallLoading control)
-                if (e.Property == IsStartAnimationProperty)
-                    if (bool.TryParse(e.NewValue.ToString(), out var bResult))
-                    {
-                        if (bResult)
-                            control.Start();
-                        else
-                            control.Stop();
-                    }
+            base.OnIsLoadingChanged(oldValue, newValue);
+            if (newValue)
+                Start();
+            else
+                Stop();
         }
 
         private bool LoadingProcedure()
         {
             if (_bLoadedAnimation)
                 return true;
-
             CalculateContainer();
             LoadResource();
             LoadAnimation();
-
             _bLoadedAnimation = true;
             return true;
         }
@@ -148,12 +115,9 @@ private bool CalculateContainer()
         {
             var vActualWidth = Part_BackGrid.ActualWidth;
             var vSingleWidth = vActualWidth / _nBallCount;
-
             var vMargin = (vSingleWidth - _BallSize) / 2;
-
             _BallFrom = vMargin;
             _BallTo = vActualWidth - vMargin - _BallSize;
-
             return true;
         }
 
@@ -161,35 +125,24 @@ private bool CalculateContainer()
         private bool LoadResource()
         {
             _mapBallColors.Clear();
-
             var tuple0 = new Tuple<Color, Color>(Color.FromRgb(0xff, 0x93, 0x03), Color.FromRgb(0xff, 0x8c, 0x09));
             _mapBallColors[0] = tuple0;
-
             var tuple1 = new Tuple<Color, Color>(Color.FromRgb(0xff, 0x78, 0x1a), Color.FromRgb(0xff, 0x6a, 0x27));
             _mapBallColors[1] = tuple1;
-
             var tuple2 = new Tuple<Color, Color>(Color.FromRgb(0xff, 0x55, 0x39), Color.FromRgb(0xff, 0x48, 0x45));
             _mapBallColors[2] = tuple2;
-
             var tuple3 = new Tuple<Color, Color>(Color.FromRgb(0xff, 0x33, 0x57), Color.FromRgb(0xff, 0x24, 0x65));
             _mapBallColors[3] = tuple3;
-
             var tuple4 = new Tuple<Color, Color>(Color.FromRgb(0xff, 0x09, 0x7c), Color.FromRgb(0xff, 0x03, 0x82));
             _mapBallColors[4] = tuple4;
-
-
             var rotate1 = new RotateTransform();
             Part_EillpseDock1.RenderTransform = rotate1;
-
             var rotate2 = new RotateTransform();
             Part_EillpseDock2.RenderTransform = rotate2;
-
             var rotate3 = new RotateTransform();
             Part_EillpseDock3.RenderTransform = rotate3;
-
             var rotate4 = new RotateTransform();
             Part_EillpseDock4.RenderTransform = rotate4;
-
             return true;
         }
 
@@ -217,14 +170,11 @@ private bool LoadAnimation()
 
             LoadAnimationBall1RotateBack(_Storyboard1);
 
-
-            if (IsStartAnimation)
+            if (IsLoading)
                 Start();
-
             return true;
         }
 
-
         //第一个小球 从左向右移动 从0号位移动到4号位  单程4s 动画缓动 500ms
         private bool LoadAnimationFromLeftToRight(Storyboard storyboard)
         {
@@ -235,11 +185,9 @@ private bool LoadAnimationFromLeftToRight(Storyboard storyboard)
                 BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime),
                 Duration = new Duration(new TimeSpan(0, 0, _SingleAnimationTime))
             };
-
             Storyboard.SetTarget(animation, Part_Eillipse);
             Storyboard.SetTargetProperty(animation, new PropertyPath("(Canvas.Left)"));
             storyboard.Children.Add(animation);
-
             return true;
         }
 
@@ -266,44 +214,32 @@ private bool LoadAnimationBallLToRTurnColors(Storyboard storyboard)
         {
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 0, 1);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 0, 1);
                 storyboard.Children.Add(animation2);
             }
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 1, 2);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 1, 2);
                 storyboard.Children.Add(animation2);
             }
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 2, 3);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 2, 3);
                 storyboard.Children.Add(animation2);
             }
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 3, 4);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 3, 4);
                 storyboard.Children.Add(animation2);
             }
-
             return true;
         }
 
@@ -313,45 +249,33 @@ private bool LoadAnimationBallRToLTurnColors(Storyboard storyboard)
             //从右向左
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 4, 3);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 4, 3);
                 storyboard.Children.Add(animation2);
             }
 
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 3, 2);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 3, 2);
                 storyboard.Children.Add(animation2);
             }
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 2, 1);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 2, 1);
                 storyboard.Children.Add(animation2);
             }
-
             {
                 //第一个小球移动过程中变色 移动到下一个位置前变色
-
                 var animation1 = BallMoveColor(Part_Eillipse, 0, 1, 0);
                 storyboard.Children.Add(animation1);
-
                 var animation2 = BallMoveColor(Part_Eillipse, 1, 1, 0);
                 storyboard.Children.Add(animation2);
             }
-
             return true;
         }
 
@@ -359,7 +283,6 @@ private bool LoadAnimationBallRToLTurnColors(Storyboard storyboard)
         private bool LoadAnimationBall1Rotate(Storyboard storyboard)
         {
             var nIndex = 0;
-
             {
                 //替补小球1 从0-180度翻转 
                 var animation = new DoubleAnimation
@@ -369,11 +292,9 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock1);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球1 从1号位移动到0号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -383,19 +304,16 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse1);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -406,11 +324,8 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
                 ++nIndex;
             }
-
-
             {
                 //替补小球2 从0-180度翻转 
                 var animation = new DoubleAnimation
@@ -420,11 +335,9 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock2);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球2 从2号位移动到1号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -434,19 +347,16 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse2);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -457,10 +367,8 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
                 ++nIndex;
             }
-
             {
                 //替补小球3 从0-180度翻转 
                 var animation = new DoubleAnimation
@@ -470,11 +378,9 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock3);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球3 从3号位移动到2号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -484,19 +390,16 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse3);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -507,10 +410,8 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
                 ++nIndex;
             }
-
             {
                 //替补小球4 从0-180度翻转 
                 var animation = new DoubleAnimation
@@ -520,11 +421,9 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock4);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球4 从4号位移动到3号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -534,19 +433,16 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(_AnimationSlowTime + nIndex * 1000),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse4);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -557,10 +453,8 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
                 ++nIndex;
             }
-
             return true;
         }
 
@@ -568,7 +462,6 @@ private bool LoadAnimationBall1Rotate(Storyboard storyboard)
         private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
         {
             var nIndex = 0;
-
             {
                 //替补小球4 从180 -360翻转
                 var animation = new DoubleAnimation
@@ -578,11 +471,9 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock4);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球4 从3号位移动到4号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -592,19 +483,16 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse4);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -615,11 +503,8 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
-
                 ++nIndex;
             }
-
             {
                 //替补小球3 从180 -360翻转
                 var animation = new DoubleAnimation
@@ -629,11 +514,9 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock3);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球3 从2号位移动到3号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -643,19 +526,16 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse3);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -666,11 +546,8 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
-
                 ++nIndex;
             }
-
             {
                 //替补小球2 从180 -360翻转
                 var animation = new DoubleAnimation
@@ -680,7 +557,6 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock2);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
@@ -694,7 +570,6 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
@@ -717,11 +592,8 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                 Storyboard.SetTargetProperty(animation2,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
-
-
                 ++nIndex;
             }
-
             {
                 //替补小球1 从180 -360翻转
                 var animation = new DoubleAnimation
@@ -731,11 +603,9 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation, Part_EillpseDock1);
                 Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Angle"));
                 storyboard.Children.Add(animation);
-
                 //替补小球1 从0号位移动到1号位颜色变化
                 var color1 = new Color();
                 var color2 = new Color();
@@ -745,19 +615,16 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     color1 = vResult.Item1;
                     color2 = vResult.Item2;
                 }
-
                 var animation1 = new ColorAnimation
                 {
                     To = color1,
                     BeginTime = TimeSpan.FromMilliseconds(nIndex * 1000 + _AnimationSlowTime),
                     Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
                 };
-
                 Storyboard.SetTarget(animation1, Part_Eillipse1);
                 Storyboard.SetTargetProperty(animation1,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[0].(GradientStop.Color)"));
                 storyboard.Children.Add(animation1);
-
                 var animation2 = new ColorAnimation
                 {
                     To = color2,
@@ -769,12 +636,9 @@ private bool LoadAnimationBall1RotateBack(Storyboard storyboard)
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
                 storyboard.Children.Add(animation2);
             }
-
-
             return true;
         }
 
-
         private ColorAnimation BallMoveColor(DependencyObject dependencyObject, int nIndex, int from, int to)
         {
             var color = new Color();
@@ -784,78 +648,75 @@ private ColorAnimation BallMoveColor(DependencyObject dependencyObject, int nInd
                 beginTime = from * 1000 + _AnimationSlowTime;
             else
                 beginTime = (_SingleAnimationTime - from) * 1000 + _AnimationSlowTime;
-
             switch (to)
             {
                 case 1:
-                {
-                    var vResult = _mapBallColors[1];
-                    if (vResult != null)
                     {
-                        if (nIndex == 0)
-                            color = vResult.Item1;
-                        else
-                            color = vResult.Item2;
+                        var vResult = _mapBallColors[1];
+                        if (vResult != null)
+                        {
+                            if (nIndex == 0)
+                                color = vResult.Item1;
+                            else
+                                color = vResult.Item2;
+                        }
                     }
-                }
                     break;
                 case 2:
-                {
-                    var vResult = _mapBallColors[2];
-                    if (vResult != null)
                     {
-                        if (nIndex == 0)
-                            color = vResult.Item1;
-                        else
-                            color = vResult.Item2;
+                        var vResult = _mapBallColors[2];
+                        if (vResult != null)
+                        {
+                            if (nIndex == 0)
+                                color = vResult.Item1;
+                            else
+                                color = vResult.Item2;
+                        }
                     }
-                }
                     break;
                 case 3:
-                {
-                    var vResult = _mapBallColors[3];
-                    if (vResult != null)
                     {
-                        if (nIndex == 0)
-                            color = vResult.Item1;
-                        else
-                            color = vResult.Item2;
+                        var vResult = _mapBallColors[3];
+                        if (vResult != null)
+                        {
+                            if (nIndex == 0)
+                                color = vResult.Item1;
+                            else
+                                color = vResult.Item2;
+                        }
                     }
-                }
                     break;
                 case 4:
-                {
-                    var vResult = _mapBallColors[4];
-                    if (vResult != null)
                     {
-                        if (nIndex == 0)
-                            color = vResult.Item1;
-                        else
-                            color = vResult.Item2;
+                        var vResult = _mapBallColors[4];
+                        if (vResult != null)
+                        {
+                            if (nIndex == 0)
+                                color = vResult.Item1;
+                            else
+                                color = vResult.Item2;
+                        }
                     }
-                }
                     break;
                 default:
-                {
-                    var vResult = _mapBallColors[0];
-                    if (vResult != null)
                     {
-                        if (nIndex == 0)
-                            color = vResult.Item1;
-                        else
-                            color = vResult.Item2;
+                        var vResult = _mapBallColors[0];
+                        if (vResult != null)
+                        {
+                            if (nIndex == 0)
+                                color = vResult.Item1;
+                            else
+                                color = vResult.Item2;
+                        }
                     }
-                }
                     break;
             }
-
             var animation = new ColorAnimation
             {
                 To = color,
                 BeginTime = TimeSpan.FromMilliseconds(beginTime),
                 Duration = new Duration(new TimeSpan(0, 0, _OffsetTime))
             };
-
             Storyboard.SetTarget(animation, dependencyObject);
 
             if (nIndex == 0)
@@ -864,7 +725,6 @@ private ColorAnimation BallMoveColor(DependencyObject dependencyObject, int nInd
             else
                 Storyboard.SetTargetProperty(animation,
                     new PropertyPath("(Ellipse.Fill).(LinearGradientBrush.GradientStops)[1].(GradientStop.Color)"));
-
             return animation;
         }
 
@@ -872,19 +732,14 @@ private void _Storyboard_Completed(object sender, EventArgs e)
         {
             if (Part_EillpseDock1.RenderTransform is RotateTransform rotate1)
                 rotate1.Angle = 180;
-
             if (Part_EillpseDock2.RenderTransform is RotateTransform rotate2)
                 rotate2.Angle = 180;
-
             if (Part_EillpseDock3.RenderTransform is RotateTransform rotate3)
                 rotate3.Angle = 180;
-
             if (Part_EillpseDock4.RenderTransform is RotateTransform rotate4)
                 rotate4.Angle = 180;
-
             Canvas.SetLeft(Part_Eillipse, _BallTo);
-
-            if (IsStartAnimation)
+            if (IsLoading)
                 _Storyboard1.Begin();
         }
 
@@ -892,34 +747,25 @@ private void _Storyboard1_Completed(object sender, EventArgs e)
         {
             if (Part_EillpseDock1.RenderTransform is RotateTransform rotate1)
                 rotate1.Angle = 0;
-
             if (Part_EillpseDock2.RenderTransform is RotateTransform rotate2)
                 rotate2.Angle = 0;
-
             if (Part_EillpseDock3.RenderTransform is RotateTransform rotate3)
                 rotate3.Angle = 0;
-
             if (Part_EillpseDock4.RenderTransform is RotateTransform rotate4)
                 rotate4.Angle = 0;
-
             Canvas.SetLeft(Part_Eillipse, _BallFrom);
-
-            if (IsStartAnimation)
+            if (IsLoading)
                 _Storyboard.Begin();
         }
 
-
         private bool Start()
         {
             if (_Storyboard == null || _Storyboard1 == null)
                 return false;
-
-            if (_IsStart)
+            if (_isLoading)
                 return true;
-
-            _IsStart = true;
+            _isLoading = true;
             _Storyboard.Begin();
-
             return true;
         }
 
@@ -927,17 +773,15 @@ private bool Stop()
         {
             _Storyboard?.Stop();
             _Storyboard1?.Stop();
-            _IsStart = false;
+            _isLoading = false;
             return true;
         }
 
         private bool Close()
         {
             Stop();
-
             _Storyboard = null;
             _Storyboard1 = null;
-
             return true;
         }
     }

From 4434a2aba4176b9e649c009ce994c7c562c59915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 5 Sep 2024 22:19:01 +0800
Subject: [PATCH 053/123] Update ScreenCut.cs

---
 .../Controls/ScreenCut/ScreenCut.cs           | 432 +++++++++---------
 1 file changed, 216 insertions(+), 216 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
index 62c58ee8..83fd932e 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCut.cs
@@ -130,42 +130,42 @@ public class ScreenCut : Window, IDisposable
 
         private Rectangle _rectangleLeft, _rectangleTop, _rectangleRight, _rectangleBottom;
         private WrapPanel _wrapPanel;
-        private AdornerLayer adornerLayer;
+        private AdornerLayer _adornerLayer;
 
         /// <summary>
         ///     当前绘制矩形
         /// </summary>
-        private Border borderRectangle;
+        private Border _borderRectangle;
 
         /// <summary>
         ///     当前箭头
         /// </summary>
-        private Control controlArrow;
+        private Control _controlArrow;
 
-        private ControlTemplate controlTemplate;
+        private ControlTemplate _controlTemplate;
 
         /// <summary>
         ///     绘制当前椭圆
         /// </summary>
-        private Ellipse drawEllipse;
+        private Ellipse _drawEllipse;
 
-        private FrameworkElement frameworkElement;
-        private bool isMouseUp;
-        private Point? pointStart, pointEnd;
+        private FrameworkElement _frameworkElement;
+        private bool _isMouseUp;
+        private Point? _pointStart, _pointEnd;
 
         /// <summary>
         ///     当前画笔
         /// </summary>
-        private Polyline polyLine;
+        private Polyline _polyLine;
 
-        private Rect rect;
-        private ScreenCutAdorner screenCutAdorner;
-        private ScreenCutMouseType screenCutMouseType = ScreenCutMouseType.Default;
+        private Rect _rect;
+        private ScreenCutAdorner _screenCutAdorner;
+        private ScreenCutMouseType _screenCutMouseType = ScreenCutMouseType.Default;
 
         /// <summary>
         ///     当前文本
         /// </summary>
-        private Border textBorder;
+        private Border _textBorder;
 
         /// <summary>
         /// 截图完成委托
@@ -183,17 +183,17 @@ public class ScreenCut : Window, IDisposable
         /// 截图取消事件
         /// </summary>
         public event ScreenShotCanceled CutCanceled;
-        private double y1;
-        private int ScreenIndex;
+        private double _y1;
+        private int _screenIndex;
         public static int CaptureScreenID = -1;
-        private Bitmap ScreenCapture;
-        private ScreenDPI screenDPI;
+        private Bitmap _screenCapture;
+        private ScreenDPI _screenDPI;
         public ScreenCut(int index)
         {
-            ScreenIndex = index;
-            this.Left = Screen.AllScreens[ScreenIndex].WorkingArea.Left;
+            _screenIndex = index;
+            this.Left = Screen.AllScreens[_screenIndex].WorkingArea.Left;
             ShowInTaskbar = false;
-            screenDPI = GetScreenDPI(ScreenIndex);
+            _screenDPI = GetScreenDPI(_screenIndex);
         }
         static ScreenCut()
         {
@@ -247,8 +247,8 @@ public override void OnApplyTemplate()
             _radioButtonText = GetTemplateChild(RadioButtonTextTemplateName) as RadioButton;
             if (_radioButtonText != null)
                 _radioButtonText.Click += RadioButtonText_Click;
-            _canvas.Width = Screen.AllScreens[ScreenIndex].Bounds.Width;
-            _canvas.Height = Screen.AllScreens[ScreenIndex].Bounds.Height;
+            _canvas.Width = Screen.AllScreens[_screenIndex].Bounds.Width;
+            _canvas.Height = Screen.AllScreens[_screenIndex].Bounds.Height;
             //_canvas.Background = new ImageBrush(ControlsHelper.Capture());
             _canvas.Background = new ImageBrush(ImagingHelper.CreateBitmapSourceFromBitmap(CopyScreen()));
             _rectangleLeft.Width = _canvas.Width;
@@ -260,7 +260,7 @@ public override void OnApplyTemplate()
             _wrapPanel = GetTemplateChild(WrapPanelColorTemplateName) as WrapPanel;
             _wrapPanel.PreviewMouseDown += WrapPanel_PreviewMouseDown;
             Loaded += ScreenCut_Loaded;
-            controlTemplate = (ControlTemplate)FindResource("WD.PART_DrawArrow");
+            _controlTemplate = (ControlTemplate)FindResource("WD.PART_DrawArrow");
         }
 
         protected override void OnClosed(EventArgs e)
@@ -302,18 +302,18 @@ private ScreenDPI GetScreenDPI(int screenIndex)
         }
         private Bitmap CopyScreen()
         {
-            Left = Screen.AllScreens[ScreenIndex].Bounds.Left / screenDPI.scaleX;
-            Top = Screen.AllScreens[ScreenIndex].Bounds.Top / screenDPI.scaleY;
-            Width = Screen.AllScreens[ScreenIndex].Bounds.Width / screenDPI.scaleX;
-            Height = Screen.AllScreens[ScreenIndex].Bounds.Height / screenDPI.scaleY;
-            _canvas.Width = Screen.AllScreens[ScreenIndex].Bounds.Width / screenDPI.scaleX;
-            _canvas.Height = Screen.AllScreens[ScreenIndex].Bounds.Height / screenDPI.scaleY;
+            Left = Screen.AllScreens[_screenIndex].Bounds.Left / _screenDPI.scaleX;
+            Top = Screen.AllScreens[_screenIndex].Bounds.Top / _screenDPI.scaleY;
+            Width = Screen.AllScreens[_screenIndex].Bounds.Width / _screenDPI.scaleX;
+            Height = Screen.AllScreens[_screenIndex].Bounds.Height / _screenDPI.scaleY;
+            _canvas.Width = Screen.AllScreens[_screenIndex].Bounds.Width / _screenDPI.scaleX;
+            _canvas.Height = Screen.AllScreens[_screenIndex].Bounds.Height / _screenDPI.scaleY;
             _canvas.SetValue(LeftProperty, Left);
             _canvas.SetValue(TopProperty, Top);
-            Bitmap ScreenCapture = new Bitmap(Screen.AllScreens[ScreenIndex].Bounds.Width, Screen.AllScreens[ScreenIndex].Bounds.Height);
+            Bitmap ScreenCapture = new Bitmap(Screen.AllScreens[_screenIndex].Bounds.Width, Screen.AllScreens[_screenIndex].Bounds.Height);
             using (Graphics g = Graphics.FromImage(ScreenCapture)) 
             {
-                g.CopyFromScreen(Screen.AllScreens[ScreenIndex].Bounds.Left, Screen.AllScreens[ScreenIndex].Bounds.Top, 0, 0, Screen.AllScreens[ScreenIndex].Bounds.Size);
+                g.CopyFromScreen(Screen.AllScreens[_screenIndex].Bounds.Left, Screen.AllScreens[_screenIndex].Bounds.Top, 0, 0, Screen.AllScreens[_screenIndex].Bounds.Size);
             }
             return ScreenCapture;
         }
@@ -360,7 +360,7 @@ private void RadioButtonChecked(RadioButton radioButton, ScreenCutMouseType scre
         {
             if (radioButton.IsChecked == true)
             {
-                screenCutMouseType = screenCutMouseTypeRadio;
+                _screenCutMouseType = screenCutMouseTypeRadio;
                 _border.Cursor = Cursors.Arrow;
                 if (_popup.PlacementTarget != null && _popup.IsOpen)
                     _popup.IsOpen = false;
@@ -370,7 +370,7 @@ private void RadioButtonChecked(RadioButton radioButton, ScreenCutMouseType scre
             }
             else
             {
-                if (screenCutMouseType == screenCutMouseTypeRadio)
+                if (_screenCutMouseType == screenCutMouseTypeRadio)
                     Restore();
             }
         }
@@ -378,8 +378,8 @@ private void RadioButtonChecked(RadioButton radioButton, ScreenCutMouseType scre
         private void Restore()
         {
             _border.Cursor = Cursors.SizeAll;
-            if (screenCutMouseType == ScreenCutMouseType.Default) return;
-            screenCutMouseType = ScreenCutMouseType.Default;
+            if (_screenCutMouseType == ScreenCutMouseType.Default) return;
+            _screenCutMouseType = ScreenCutMouseType.Default;
             if (_popup.PlacementTarget != null && _popup.IsOpen)
                 _popup.IsOpen = false;
         }
@@ -392,14 +392,14 @@ private void ResoreRadioButton()
 
         private void _border_SizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (isMouseUp)
+            if (_isMouseUp)
             {
                 var left = Canvas.GetLeft(_border);
                 var top = Canvas.GetTop(_border);
                 var beignPoint = new Point(left, top);
                 var endPoint = new Point(left + _border.ActualWidth, top + _border.ActualHeight);
-                rect = new Rect(beignPoint, endPoint);
-                pointStart = beignPoint;
+                _rect = new Rect(beignPoint, endPoint);
+                _pointStart = beignPoint;
                 MoveAllRectangle(endPoint);
             }
             EditBarPosition();
@@ -407,8 +407,8 @@ private void _border_SizeChanged(object sender, SizeChangedEventArgs e)
         
         private void Border_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
-            if (screenCutMouseType == ScreenCutMouseType.Default)
-                screenCutMouseType = ScreenCutMouseType.MoveMouse;
+            if (_screenCutMouseType == ScreenCutMouseType.Default)
+                _screenCutMouseType = ScreenCutMouseType.MoveMouse;
         }
         
         private void ButtonSave_Click(object sender, RoutedEventArgs e)
@@ -450,17 +450,17 @@ private CroppedBitmap CutBitmap()
             _rectangleRight.Visibility = Visibility.Collapsed;
             _rectangleBottom.Visibility = Visibility.Collapsed;
             // 屏幕等比截图需要考虑缩放率进行等比放大canvas
-            var renderTargetBitmap = new RenderTargetBitmap((int)(_canvas.Width * screenDPI.scaleX),
-                (int)(_canvas.Height * screenDPI.scaleY), screenDPI.dpiX, screenDPI.dpiY, PixelFormats.Default);
+            var renderTargetBitmap = new RenderTargetBitmap((int)(_canvas.Width * _screenDPI.scaleX),
+                (int)(_canvas.Height * _screenDPI.scaleY), _screenDPI.dpiX, _screenDPI.dpiY, PixelFormats.Default);
             renderTargetBitmap.Render(_canvas);
             // 屏幕等比截图需要考虑缩放率进行等比放大截图区域
             var realrect = new Int32Rect(
-                (int)(rect.X * screenDPI.scaleX),
-                (int)(rect.Y * screenDPI.scaleY),
-                (int)(rect.Width * screenDPI.scaleX),
-                (int)(rect.Height * screenDPI.scaleY));
+                (int)(_rect.X * _screenDPI.scaleX),
+                (int)(_rect.Y * _screenDPI.scaleY),
+                (int)(_rect.Width * _screenDPI.scaleX),
+                (int)(_rect.Height * _screenDPI.scaleY));
             //return new CroppedBitmap(renderTargetBitmap,
-            //    new Int32Rect((int)rect.X, (int)rect.Y, (int)rect.Width, (int)rect.Height));
+            //    new Int32Rect((int)_rect.X, (int)_rect.Y, (int)_rect.Width, (int)_rect.Height));
             return new CroppedBitmap(renderTargetBitmap, realrect);
         }
         
@@ -483,7 +483,7 @@ protected override void OnPreviewKeyDown(KeyEventArgs e)
             else if (e.Key == Key.Delete)
             {
                 if (_canvas.Children.Count > 0)
-                    _canvas.Children.Remove(frameworkElement);
+                    _canvas.Children.Remove(_frameworkElement);
             }
             else if (e.KeyStates == Keyboard.GetKeyStates(Key.Z) && Keyboard.Modifiers == ModifierKeys.Control)
             {
@@ -500,38 +500,38 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
             // if is multi-screen, only one screen is allowed.
             if (CaptureScreenID == -1)
             {
-                CaptureScreenID = ScreenIndex;
+                CaptureScreenID = _screenIndex;
             }
-            if (CaptureScreenID != -1 && CaptureScreenID != ScreenIndex)
+            if (CaptureScreenID != -1 && CaptureScreenID != _screenIndex)
             {
                 e.Handled = true;
                 return;
             }
 
             var vPoint = e.GetPosition(_canvas);
-            if (!isMouseUp)
+            if (!_isMouseUp)
             {
-                pointStart = vPoint;
-                screenCutMouseType = ScreenCutMouseType.DrawMouse;
+                _pointStart = vPoint;
+                _screenCutMouseType = ScreenCutMouseType.DrawMouse;
                 _editBar.Visibility = Visibility.Hidden;
-                pointEnd = pointStart;
-                rect = new Rect(pointStart.Value, pointEnd.Value);
+                _pointEnd = _pointStart;
+                _rect = new Rect(_pointStart.Value, _pointEnd.Value);
             }
             else
             {
-                if (vPoint.X < rect.Left || vPoint.X > rect.Right)
+                if (vPoint.X < _rect.Left || vPoint.X > _rect.Right)
                     return;
 
-                if (vPoint.Y < rect.Top || vPoint.Y > rect.Bottom)
+                if (vPoint.Y < _rect.Top || vPoint.Y > _rect.Bottom)
                     return;
-                pointStart = vPoint;
-                if (textBorder != null)
+                _pointStart = vPoint;
+                if (_textBorder != null)
                     Focus();
 
-                switch (screenCutMouseType)
+                switch (_screenCutMouseType)
                 {
                     case ScreenCutMouseType.DrawText:
-                        y1 = vPoint.Y;
+                        _y1 = vPoint.Y;
                         DrawText();
                         break;
                     default:
@@ -543,18 +543,18 @@ protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
         
         private void DrawText()
         {
-            if (pointStart.Value.X < rect.Right
+            if (_pointStart.Value.X < _rect.Right
                 &&
-                pointStart.Value.X > rect.Left
+                _pointStart.Value.X > _rect.Left
                 &&
-                pointStart.Value.Y > rect.Top
+                _pointStart.Value.Y > _rect.Top
                 &&
-                pointStart.Value.Y < rect.Bottom)
+                _pointStart.Value.Y < _rect.Bottom)
             {
-                var currentWAndX = pointStart.Value.X + 40;
-                if (textBorder == null)
+                var currentWAndX = _pointStart.Value.X + 40;
+                if (_textBorder == null)
                 {
-                    textBorder = new Border
+                    _textBorder = new Border
                     {
                         BorderBrush = _currentBrush == null ? Brushes.Red : _currentBrush,
                         BorderThickness = new Thickness(1),
@@ -565,14 +565,14 @@ private void DrawText()
                     textBox.Style = null;
                     textBox.Background = null;
                     textBox.BorderThickness = new Thickness(0);
-                    textBox.Foreground = textBorder.BorderBrush;
+                    textBox.Foreground = _textBorder.BorderBrush;
                     textBox.FontFamily = DrawingContextHelper.FontFamily;
                     textBox.FontSize = 16;
                     textBox.TextWrapping = TextWrapping.Wrap;
                     textBox.FontWeight = FontWeights.Normal;
                     textBox.MinWidth = _width;
-                    textBox.MaxWidth = rect.Right - pointStart.Value.X;
-                    textBox.MaxHeight = rect.Height - 4;
+                    textBox.MaxWidth = _rect.Right - _pointStart.Value.X;
+                    textBox.MaxHeight = _rect.Height - 4;
                     textBox.Cursor = Cursors.Hand;
 
                     textBox.Padding = new Thickness(4);
@@ -588,36 +588,36 @@ private void DrawText()
                                 _canvas.Children.Remove(border);
                         }
                     };
-                    textBorder.SizeChanged += (s, e1) =>
+                    _textBorder.SizeChanged += (s, e1) =>
                     {
                         var tb = s as Border;
-                        var y = y1;
-                        if (y + tb.ActualHeight > rect.Bottom)
+                        var y = _y1;
+                        if (y + tb.ActualHeight > _rect.Bottom)
                         {
-                            var v = Math.Abs(rect.Bottom - (y + tb.ActualHeight));
-                            y1 = y - v;
-                            Canvas.SetTop(tb, y1 + 2);
+                            var v = Math.Abs(_rect.Bottom - (y + tb.ActualHeight));
+                            _y1 = y - v;
+                            Canvas.SetTop(tb, _y1 + 2);
                         }
                     };
-                    textBorder.PreviewMouseLeftButtonDown += (s, e) =>
+                    _textBorder.PreviewMouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonText.IsChecked = true;
                         RadioButtonText_Click(null, null);
                         SelectElement();
                         var border = s as Border;
-                        frameworkElement = border;
-                        frameworkElement.Opacity = .7;
+                        _frameworkElement = border;
+                        _frameworkElement.Opacity = .7;
                         border.BorderThickness = new Thickness(1);
                     };
-                    textBorder.Child = textBox;
-                    _canvas.Children.Add(textBorder);
+                    _textBorder.Child = textBox;
+                    _canvas.Children.Add(_textBorder);
                     textBox.Focus();
-                    var x = pointStart.Value.X;
+                    var x = _pointStart.Value.X;
 
-                    if (currentWAndX > rect.Right)
-                        x = x - (currentWAndX - rect.Right);
-                    Canvas.SetLeft(textBorder, x - 2);
-                    Canvas.SetTop(textBorder, pointStart.Value.Y - 2);
+                    if (currentWAndX > _rect.Right)
+                        x = x - (currentWAndX - _rect.Right);
+                    Canvas.SetLeft(_textBorder, x - 2);
+                    Canvas.SetTop(_textBorder, _pointStart.Value.Y - 2);
                 }
             }
         }
@@ -627,13 +627,13 @@ protected override void OnPreviewMouseMove(MouseEventArgs e)
             if (e.Source is RadioButton)
                 return;
 
-            if (pointStart is null)
+            if (_pointStart is null)
                 return;
 
             if (e.LeftButton == MouseButtonState.Pressed)
             {
                 var current = e.GetPosition(_canvas);
-                switch (screenCutMouseType)
+                switch (_screenCutMouseType)
                 {
                     case ScreenCutMouseType.DrawMouse:
                         MoveAllRectangle(current);
@@ -657,109 +657,109 @@ protected override void OnPreviewMouseMove(MouseEventArgs e)
 
         private void CheckPoint(Point current)
         {
-            if (current == pointStart) return;
+            if (current == _pointStart) return;
 
-            if (current.X > rect.BottomRight.X
+            if (current.X > _rect.BottomRight.X
                 ||
-                current.Y > rect.BottomRight.Y)
+                current.Y > _rect.BottomRight.Y)
                 return;
         }
         
         private void DrwaInkControl(Point current)
         {
             CheckPoint(current);
-            if (current.X >= rect.Left
+            if (current.X >= _rect.Left
                 &&
-                current.X <= rect.Right
+                current.X <= _rect.Right
                 &&
-                current.Y >= rect.Top
+                current.Y >= _rect.Top
                 &&
-                current.Y <= rect.Bottom)
+                current.Y <= _rect.Bottom)
             {
-                if (polyLine == null)
+                if (_polyLine == null)
                 {
-                    polyLine = new Polyline();
-                    polyLine.Stroke = _currentBrush == null ? Brushes.Red : _currentBrush;
-                    polyLine.Cursor = Cursors.Hand;
-                    polyLine.StrokeThickness = 3;
-                    polyLine.StrokeLineJoin = PenLineJoin.Round;
-                    polyLine.StrokeStartLineCap = PenLineCap.Round;
-                    polyLine.StrokeEndLineCap = PenLineCap.Round;
-                    polyLine.MouseLeftButtonDown += (s, e) =>
+                    _polyLine = new Polyline();
+                    _polyLine.Stroke = _currentBrush == null ? Brushes.Red : _currentBrush;
+                    _polyLine.Cursor = Cursors.Hand;
+                    _polyLine.StrokeThickness = 3;
+                    _polyLine.StrokeLineJoin = PenLineJoin.Round;
+                    _polyLine.StrokeStartLineCap = PenLineCap.Round;
+                    _polyLine.StrokeEndLineCap = PenLineCap.Round;
+                    _polyLine.MouseLeftButtonDown += (s, e) =>
                     {
                         _radioButtonInk.IsChecked = true;
                         RadioButtonInk_Click(null, null);
                         SelectElement();
-                        frameworkElement = s as Polyline;
-                        frameworkElement.Opacity = .7;
+                        _frameworkElement = s as Polyline;
+                        _frameworkElement.Opacity = .7;
                     };
-                    _canvas.Children.Add(polyLine);
+                    _canvas.Children.Add(_polyLine);
                 }
 
-                polyLine.Points.Add(current);
+                _polyLine.Points.Add(current);
             }
         }
         
         private void DrawArrowControl(Point current)
         {
             CheckPoint(current);
-            if (screenCutMouseType != ScreenCutMouseType.DrawArrow)
+            if (_screenCutMouseType != ScreenCutMouseType.DrawArrow)
                 return;
 
-            if (pointStart is null)
+            if (_pointStart is null)
                 return;
 
-            var vPoint = pointStart.Value;
+            var vPoint = _pointStart.Value;
 
             var drawArrow = new Rect(vPoint, current);
-            if (controlArrow == null)
+            if (_controlArrow == null)
             {
-                controlArrow = new Control();
-                controlArrow.Background = _currentBrush == null ? Brushes.Red : _currentBrush;
-                controlArrow.Template = controlTemplate;
-                controlArrow.Cursor = Cursors.Hand;
-                controlArrow.Tag = _tag;
-                controlArrow.MouseLeftButtonDown += (s, e) =>
+                _controlArrow = new Control();
+                _controlArrow.Background = _currentBrush == null ? Brushes.Red : _currentBrush;
+                _controlArrow.Template = _controlTemplate;
+                _controlArrow.Cursor = Cursors.Hand;
+                _controlArrow.Tag = _tag;
+                _controlArrow.MouseLeftButtonDown += (s, e) =>
                 {
                     _radioButtonArrow.IsChecked = true;
                     RadioButtonArrow_Click(null, null);
                     SelectElement();
-                    frameworkElement = s as Control;
-                    frameworkElement.Opacity = .7;
+                    _frameworkElement = s as Control;
+                    _frameworkElement.Opacity = .7;
                 };
-                _canvas.Children.Add(controlArrow);
-                Canvas.SetLeft(controlArrow, drawArrow.Left);
-                Canvas.SetTop(controlArrow, drawArrow.Top - 7.5);
+                _canvas.Children.Add(_controlArrow);
+                Canvas.SetLeft(_controlArrow, drawArrow.Left);
+                Canvas.SetTop(_controlArrow, drawArrow.Top - 7.5);
             }
 
             var rotate = new RotateTransform();
             var renderOrigin = new Point(0, .5);
-            controlArrow.RenderTransformOrigin = renderOrigin;
-            controlArrow.RenderTransform = rotate;
+            _controlArrow.RenderTransformOrigin = renderOrigin;
+            _controlArrow.RenderTransform = rotate;
             rotate.Angle = Helper.CalculeAngle(vPoint, current);
-            if (current.X < rect.Left
+            if (current.X < _rect.Left
                 ||
-                current.X > rect.Right
+                current.X > _rect.Right
                 ||
-                current.Y < rect.Top
+                current.Y < _rect.Top
                 ||
-                current.Y > rect.Bottom)
+                current.Y > _rect.Bottom)
             {
                 if (current.X >= vPoint.X && current.Y < vPoint.Y)
                 {
                     var a1 = (current.Y - vPoint.Y) / (current.X - vPoint.X);
                     var b1 = vPoint.Y - a1 * vPoint.X;
-                    var xTop = (rect.Top - b1) / a1;
-                    var yRight = a1 * rect.Right + b1;
+                    var xTop = (_rect.Top - b1) / a1;
+                    var yRight = a1 * _rect.Right + b1;
 
-                    if (xTop <= rect.Right)
+                    if (xTop <= _rect.Right)
                     {
                         current.X = xTop;
-                        current.Y = rect.Top;
+                        current.Y = _rect.Top;
                     }
                     else
                     {
-                        current.X = rect.Right;
+                        current.X = _rect.Right;
                         current.Y = yRight;
                     }
                 }
@@ -767,17 +767,17 @@ private void DrawArrowControl(Point current)
                 {
                     var a1 = (current.Y - vPoint.Y) / (current.X - vPoint.X);
                     var b1 = vPoint.Y - a1 * vPoint.X;
-                    var xBottom = (rect.Bottom - b1) / a1;
-                    var yRight = a1 * rect.Right + b1;
+                    var xBottom = (_rect.Bottom - b1) / a1;
+                    var yRight = a1 * _rect.Right + b1;
 
-                    if (xBottom <= rect.Right)
+                    if (xBottom <= _rect.Right)
                     {
                         current.X = xBottom;
-                        current.Y = rect.Bottom;
+                        current.Y = _rect.Bottom;
                     }
                     else
                     {
-                        current.X = rect.Right;
+                        current.X = _rect.Right;
                         current.Y = yRight;
                     }
                 }
@@ -785,16 +785,16 @@ private void DrawArrowControl(Point current)
                 {
                     var a1 = (current.Y - vPoint.Y) / (current.X - vPoint.X);
                     var b1 = vPoint.Y - a1 * vPoint.X;
-                    var xTop = (rect.Top - b1) / a1;
-                    var yLeft = a1 * rect.Left + b1;
-                    if (xTop >= rect.Left)
+                    var xTop = (_rect.Top - b1) / a1;
+                    var yLeft = a1 * _rect.Left + b1;
+                    if (xTop >= _rect.Left)
                     {
                         current.X = xTop;
-                        current.Y = rect.Top;
+                        current.Y = _rect.Top;
                     }
                     else
                     {
-                        current.X = rect.Left;
+                        current.X = _rect.Left;
                         current.Y = yLeft;
                     }
                 }
@@ -802,18 +802,18 @@ private void DrawArrowControl(Point current)
                 {
                     var a1 = (current.Y - vPoint.Y) / (current.X - vPoint.X);
                     var b1 = vPoint.Y - a1 * vPoint.X;
-                    var xBottom = (rect.Bottom - b1) / a1;
-                    var yLeft = a1 * rect.Left + b1;
+                    var xBottom = (_rect.Bottom - b1) / a1;
+                    var yLeft = a1 * _rect.Left + b1;
 
-                    if (xBottom <= rect.Left)
+                    if (xBottom <= _rect.Left)
                     {
-                        current.X = rect.Left;
+                        current.X = _rect.Left;
                         current.Y = yLeft;
                     }
                     else
                     {
                         current.X = xBottom;
-                        current.Y = rect.Bottom;
+                        current.Y = _rect.Bottom;
                     }
                 }
             }
@@ -822,24 +822,24 @@ private void DrawArrowControl(Point current)
             var y = current.Y - vPoint.Y;
             var width = Math.Sqrt(Math.Pow(x, 2) + Math.Pow(y, 2));
             width = width < 15 ? 15 : width;
-            controlArrow.Width = width;
+            _controlArrow.Width = width;
         }
         
         private void DrawMultipleControl(Point current)
         {
             CheckPoint(current);
-            if (pointStart is null)
+            if (_pointStart is null)
                 return;
 
-            var vPoint = pointStart.Value;
+            var vPoint = _pointStart.Value;
 
             var drawRect = new Rect(vPoint, current);
-            switch (screenCutMouseType)
+            switch (_screenCutMouseType)
             {
                 case ScreenCutMouseType.DrawRectangle:
-                    if (borderRectangle == null)
+                    if (_borderRectangle == null)
                     {
-                        borderRectangle = new Border
+                        _borderRectangle = new Border
                         {
                             BorderBrush = _currentBrush == null ? Brushes.Red : _currentBrush,
                             BorderThickness = new Thickness(3),
@@ -847,37 +847,37 @@ private void DrawMultipleControl(Point current)
                             Tag = _tag,
                             Cursor = Cursors.Hand
                         };
-                        borderRectangle.MouseLeftButtonDown += (s, e) =>
+                        _borderRectangle.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonRectangle.IsChecked = true;
                             RadioButtonRectangle_Click(null, null);
                             SelectElement();
-                            frameworkElement = s as Border;
-                            frameworkElement.Opacity = .7;
+                            _frameworkElement = s as Border;
+                            _frameworkElement.Opacity = .7;
                         };
-                        _canvas.Children.Add(borderRectangle);
+                        _canvas.Children.Add(_borderRectangle);
                     }
 
                     break;
                 case ScreenCutMouseType.DrawEllipse:
-                    if (drawEllipse == null)
+                    if (_drawEllipse == null)
                     {
-                        drawEllipse = new Ellipse
+                        _drawEllipse = new Ellipse
                         {
                             Stroke = _currentBrush == null ? Brushes.Red : _currentBrush,
                             StrokeThickness = 3,
                             Tag = _tag,
                             Cursor = Cursors.Hand
                         };
-                        drawEllipse.MouseLeftButtonDown += (s, e) =>
+                        _drawEllipse.MouseLeftButtonDown += (s, e) =>
                         {
                             _radioButtonEllipse.IsChecked = true;
                             RadioButtonEllipse_Click(null, null);
                             SelectElement();
-                            frameworkElement = s as Ellipse;
-                            frameworkElement.Opacity = .7;
+                            _frameworkElement = s as Ellipse;
+                            _frameworkElement.Opacity = .7;
                         };
-                        _canvas.Children.Add(drawEllipse);
+                        _canvas.Children.Add(_drawEllipse);
                     }
 
                     break;
@@ -892,16 +892,16 @@ private void DrawMultipleControl(Point current)
                 var wLeft = Canvas.GetLeft(_border) + _border.ActualWidth;
                 var left = drawRect.Left < Canvas.GetLeft(_border) ? Canvas.GetLeft(_border) :
                     drawRect.Left > wLeft ? wLeft : drawRect.Left;
-                if (borderRectangle != null)
+                if (_borderRectangle != null)
                 {
-                    borderRectangle.Width = drawRect.Width;
-                    Canvas.SetLeft(borderRectangle, left);
+                    _borderRectangle.Width = drawRect.Width;
+                    Canvas.SetLeft(_borderRectangle, left);
                 }
 
-                if (drawEllipse != null)
+                if (_drawEllipse != null)
                 {
-                    drawEllipse.Width = drawRect.Width;
-                    Canvas.SetLeft(drawEllipse, left);
+                    _drawEllipse.Width = drawRect.Width;
+                    Canvas.SetLeft(_drawEllipse, left);
                 }
             }
 
@@ -913,16 +913,16 @@ private void DrawMultipleControl(Point current)
                 var hTop = Canvas.GetTop(_border) + _border.Height;
                 var top = drawRect.Top < Canvas.GetTop(_border) ? Canvas.GetTop(_border) :
                     drawRect.Top > hTop ? hTop : drawRect.Top;
-                if (borderRectangle != null)
+                if (_borderRectangle != null)
                 {
-                    borderRectangle.Height = drawRect.Height;
-                    Canvas.SetTop(borderRectangle, top);
+                    _borderRectangle.Height = drawRect.Height;
+                    Canvas.SetTop(_borderRectangle, top);
                 }
 
-                if (drawEllipse != null)
+                if (_drawEllipse != null)
                 {
-                    drawEllipse.Height = drawRect.Height;
-                    Canvas.SetTop(drawEllipse, top);
+                    _drawEllipse.Height = drawRect.Height;
+                    Canvas.SetTop(_drawEllipse, top);
                 }
             }
         }
@@ -940,10 +940,10 @@ private void SelectElement()
         
         private void MoveRect(Point current)
         {
-            if (pointStart is null)
+            if (_pointStart is null)
                 return;
 
-            var vPoint = pointStart.Value;
+            var vPoint = _pointStart.Value;
 
             if (current != vPoint)
             {
@@ -958,11 +958,11 @@ private void MoveRect(Point current)
                     left = _canvas.ActualWidth - _border.ActualWidth;
                 if (top + _border.Height >= _canvas.ActualHeight)
                     top = _canvas.ActualHeight - _border.ActualHeight;
-                pointStart = current;
+                _pointStart = current;
 
                 Canvas.SetLeft(_border, left);
                 Canvas.SetTop(_border, top);
-                rect = new Rect(new Point(left, top), new Point(left + _border.Width, top + _border.Height));
+                _rect = new Rect(new Point(left, top), new Point(left + _border.Width, top + _border.Height));
                 _rectangleLeft.Height = _canvas.ActualHeight;
                 _rectangleLeft.Width = left <= 0 ? 0 : left >= _canvas.ActualWidth ? _canvas.ActualWidth : left;
 
@@ -987,17 +987,17 @@ protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
         {
             if (e.Source is ToggleButton)
                 return;
-            if (pointStart == pointEnd)
+            if (_pointStart == _pointEnd)
             {
                 return;
             }
             var fElement = e.Source as FrameworkElement;
             if (fElement != null && fElement.Tag == null)
                 SelectElement();
-            isMouseUp = true;
-            if (screenCutMouseType != ScreenCutMouseType.Default)
+            _isMouseUp = true;
+            if (_screenCutMouseType != ScreenCutMouseType.Default)
             {
-                if (screenCutMouseType == ScreenCutMouseType.MoveMouse)
+                if (_screenCutMouseType == ScreenCutMouseType.MoveMouse)
                     EditBarPosition();
 
                 if (_radioButtonRectangle.IsChecked != true
@@ -1009,7 +1009,7 @@ protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
                     _radioButtonText.IsChecked != true
                     &&
                     _radioButtonInk.IsChecked != true)
-                    screenCutMouseType = ScreenCutMouseType.Default;
+                    _screenCutMouseType = ScreenCutMouseType.Default;
                 else
                     DisposeControl();
             }
@@ -1017,19 +1017,19 @@ protected override void OnPreviewMouseLeftButtonUp(MouseButtonEventArgs e)
         
         private void DisposeControl()
         {
-            polyLine = null;
-            textBorder = null;
-            borderRectangle = null;
-            drawEllipse = null;
-            controlArrow = null;
-            pointStart = null;
-            pointEnd = null;
+            _polyLine = null;
+            _textBorder = null;
+            _borderRectangle = null;
+            _drawEllipse = null;
+            _controlArrow = null;
+            _pointStart = null;
+            _pointEnd = null;
         }
         
         private void EditBarPosition()
         {
             _editBar.Visibility = Visibility.Visible;
-            Canvas.SetLeft(_editBar, rect.X + rect.Width - _editBar.ActualWidth);
+            Canvas.SetLeft(_editBar, _rect.X + _rect.Width - _editBar.ActualWidth);
             var y = Canvas.GetTop(_border) + _border.ActualHeight + _editBar.ActualHeight + _popupBorder.ActualHeight +
                     24;
             if (y > _canvas.ActualHeight && Canvas.GetTop(_border) > _editBar.ActualHeight)
@@ -1048,55 +1048,55 @@ private void EditBarPosition()
         
         private void MoveAllRectangle(Point current)
         {
-            if (pointStart is null)
+            if (_pointStart is null)
                 return;
 
-            var vPoint = pointStart.Value;
+            var vPoint = _pointStart.Value;
 
-            pointEnd = current;
+            _pointEnd = current;
             var vEndPoint = current;
 
-            rect = new Rect(vPoint, vEndPoint);
-            _rectangleLeft.Width = rect.X < 0 ? 0 : rect.X > _canvas.ActualWidth ? _canvas.ActualWidth : rect.X;
+            _rect = new Rect(vPoint, vEndPoint);
+            _rectangleLeft.Width = _rect.X < 0 ? 0 : _rect.X > _canvas.ActualWidth ? _canvas.ActualWidth : _rect.X;
             _rectangleLeft.Height = _canvas.Height;
 
             Canvas.SetLeft(_rectangleTop, _rectangleLeft.Width);
-            _rectangleTop.Width = rect.Width;
+            _rectangleTop.Width = _rect.Width;
             var h = 0.0;
             if (current.Y < vPoint.Y)
                 h = current.Y;
             else
-                h = current.Y - rect.Height;
+                h = current.Y - _rect.Height;
 
             _rectangleTop.Height = h < 0 ? 0 : h > _canvas.ActualHeight ? _canvas.ActualHeight : h;
 
-            Canvas.SetLeft(_rectangleRight, _rectangleLeft.Width + rect.Width);
-            var rWidth = _canvas.Width - (rect.Width + _rectangleLeft.Width);
+            Canvas.SetLeft(_rectangleRight, _rectangleLeft.Width + _rect.Width);
+            var rWidth = _canvas.Width - (_rect.Width + _rectangleLeft.Width);
             _rectangleRight.Width = rWidth < 0 ? 0 : rWidth > _canvas.ActualWidth ? _canvas.ActualWidth : rWidth;
 
             _rectangleRight.Height = _canvas.Height;
 
             Canvas.SetLeft(_rectangleBottom, _rectangleLeft.Width);
-            Canvas.SetTop(_rectangleBottom, rect.Height + _rectangleTop.Height);
-            _rectangleBottom.Width = rect.Width;
-            var rBottomHeight = _canvas.Height - (rect.Height + _rectangleTop.Height);
+            Canvas.SetTop(_rectangleBottom, _rect.Height + _rectangleTop.Height);
+            _rectangleBottom.Width = _rect.Width;
+            var rBottomHeight = _canvas.Height - (_rect.Height + _rectangleTop.Height);
             _rectangleBottom.Height = rBottomHeight < 0 ? 0 : rBottomHeight;
 
-            _border.Height = rect.Height;
-            _border.Width = rect.Width;
-            Canvas.SetLeft(_border, rect.X);
-            Canvas.SetTop(_border, rect.Y);
+            _border.Height = _rect.Height;
+            _border.Width = _rect.Width;
+            Canvas.SetLeft(_border, _rect.X);
+            Canvas.SetTop(_border, _rect.Y);
 
-            if (adornerLayer != null) return;
+            if (_adornerLayer != null) return;
             _border.Opacity = 1;
-            adornerLayer = AdornerLayer.GetAdornerLayer(_border);
-            screenCutAdorner = new ScreenCutAdorner(_border);
-            screenCutAdorner.PreviewMouseDown += (s, e) =>
+            _adornerLayer = AdornerLayer.GetAdornerLayer(_border);
+            _screenCutAdorner = new ScreenCutAdorner(_border);
+            _screenCutAdorner.PreviewMouseDown += (s, e) =>
             {
                 Restore();
                 ResoreRadioButton();
             };
-            adornerLayer.Add(screenCutAdorner);
+            _adornerLayer.Add(_screenCutAdorner);
             _border.SizeChanged += _border_SizeChanged;
         }
         

From 183c08f66ac79c976431d9fb320492ba994907c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 5 Sep 2024 22:44:45 +0800
Subject: [PATCH 054/123] Fix issue (#108 )

Del StreamerLoading.cs
---
 src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 9769bd4f..1343d183 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -83,7 +83,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\NormalLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\RingLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\RollLoading.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\StreamerLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\WaitLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\Loading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\DefaultLoading.cs" />

From 0c2f6c84bbe0b38ae2e6fd3afffdec449a546051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:50:56 +0800
Subject: [PATCH 055/123] Fix Issue (#109)

Fix Issue (#109)
---
 src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
index 368eed56..d3f4413c 100644
--- a/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
+++ b/src/WPFDevelopers.Shared/Controls/TimePicker/TimePicker.cs
@@ -25,7 +25,9 @@ public class TimePicker : Control
 
         public static readonly DependencyProperty SelectedTimeProperty =
             DependencyProperty.Register("SelectedTime", typeof(DateTime?), typeof(TimePicker),
-                new PropertyMetadata(null, OnSelectedTimeChanged));
+                new FrameworkPropertyMetadata(null, 
+                    FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+                    OnSelectedTimeChanged));
 
         public static readonly DependencyProperty IsCurrentTimeProperty =
             DependencyProperty.Register("IsCurrentTime", typeof(bool), typeof(TimePicker), new PropertyMetadata(false));
@@ -69,7 +71,7 @@ private static void OnMaxDropDownHeightChanged(DependencyObject d, DependencyPro
         protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newValue)
         {
         }
-
+        
         private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var ctrl = d as TimePicker;

From f022f9c082051ad6e71848238f503fb78803b523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:51:05 +0800
Subject: [PATCH 056/123] Update Styles.Label.xaml

---
 src/WPFDevelopers.Shared/Styles/Styles.Label.xaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
index 1e16f213..cc02bb9c 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Label.xaml
@@ -1,12 +1,16 @@
 <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" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
+    <Style
+        x:Key="WD.DefaultLabel"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type Label}">
         <Setter Property="HorizontalContentAlignment" Value="Left" />
         <Setter Property="VerticalContentAlignment" Value="Top" />
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
@@ -18,6 +22,7 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="true">
                         <ContentPresenter
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"

From 08bd8b206d9abc1b7b9b69d65aa0513be9badc21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:51:29 +0800
Subject: [PATCH 057/123] Update TimePickerExample.xaml

---
 .../ExampleViews/TimePickerExample.xaml                       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
index 88f0c215..5a0055a6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
@@ -25,6 +25,10 @@
                 VerticalAlignment="Center"
                 wd:ElementHelper.Watermark="selection time"
                 SelectedTime="2023-05-06 23:59:59" />
+            <wd:TimePicker
+                Width="200"
+                VerticalAlignment="Center"
+                SelectedTime="{Binding MyDateTime, RelativeSource={RelativeSource AncestorType=local:TimePickerExample}}" />
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/TimePickerExample.xaml" CodeType="Xaml" />

From 691ed2eb4cc7c8d86aea2c03635323320affc219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:51:32 +0800
Subject: [PATCH 058/123] Update TimePickerExample.xaml.cs

---
 .../ExampleViews/TimePickerExample.xaml.cs        | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs
index 35be815c..b84a3ca5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml.cs
@@ -1,4 +1,6 @@
-using System.Windows.Controls;
+using System;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
@@ -7,9 +9,20 @@ namespace WPFDevelopers.Samples.ExampleViews
     /// </summary>
     public partial class TimePickerExample : UserControl
     {
+
+        public DateTime? MyDateTime
+        {
+            get { return (DateTime)GetValue(MyDateTimeProperty); }
+            set { SetValue(MyDateTimeProperty, value); }
+        }
+
+        public static readonly DependencyProperty MyDateTimeProperty =
+            DependencyProperty.Register("MyDateTime", typeof(DateTime?), typeof(TimePickerExample), new PropertyMetadata(null));
+
         public TimePickerExample()
         {
             InitializeComponent();
+            MyDateTime = DateTime.Now.AddHours(1);
         }
     }
 }

From 77263a53c7ad3c01c0f350f5c532fba54bb9f428 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:53:19 +0800
Subject: [PATCH 059/123] Create PanelHelper.cs

---
 .../Core/Helpers/PanelHelper.cs               | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs

diff --git a/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs
new file mode 100644
index 00000000..eba40d29
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Helpers
+{
+    public class PanelHelper : DependencyObject
+    {
+
+        public static double GetSpacing(DependencyObject obj)
+        {
+            return (double)obj.GetValue(SpacingProperty);
+        }
+
+        public static void SetSpacing(DependencyObject obj, double value)
+        {
+            obj.SetValue(SpacingProperty, value);
+        }
+
+        public static readonly DependencyProperty SpacingProperty =
+            DependencyProperty.RegisterAttached("Spacing", typeof(double), typeof(PanelHelper), new UIPropertyMetadata(0d, OnSpacingChanged));
+
+        private static void OnSpacingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            if (d is Panel panel)
+            {
+                double newValue = (double)e.NewValue;
+                double oldValue = (double)e.OldValue;
+                if (panel.IsLoaded)
+                {
+                    UpdateChildrenSpacing(panel, newValue);
+                }
+                else
+                {
+                    panel.Loaded -= OnPanelLoaded;
+                    panel.Loaded += OnPanelLoaded;
+                    panel.SetValue(SpacingProperty, newValue);
+                }
+            }
+        }
+
+        private static void OnPanelLoaded(object sender, RoutedEventArgs e)
+        {
+            if (sender is Panel panel)
+            {
+                double spacing = (double)panel.GetValue(SpacingProperty);
+                UpdateChildrenSpacing(panel, spacing);
+                panel.Loaded -= OnPanelLoaded;
+            }
+        }
+
+        private static void UpdateChildrenSpacing(Panel panel, double spacing)
+        {
+            foreach (UIElement child in panel.Children)
+            {
+                if (child is FrameworkElement frameworkElement)
+                {
+                    frameworkElement.Margin = new Thickness(spacing);
+                }
+            }
+        }
+    }
+}

From 55d9ecd84fdee6f7b6f16b1fef62d37fd55da527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:53:35 +0800
Subject: [PATCH 060/123] Update AnimationAudioExample.xaml

---
 .../ExampleViews/AnimationAudioExample.xaml   | 105 ++++++++++--------
 1 file changed, 59 insertions(+), 46 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
index ce59e168..100340e3 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
@@ -1,52 +1,65 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.AnimationAudioExample"
+    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>
-        <UniformGrid Columns="2" x:Name="MyUniformGrid">
-        <StackPanel Orientation="Horizontal">
-            <wd:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
-                                   VerticalAlignment="Center" HorizontalAlignment="Left"
-                               Margin="10,0">
-                <Ellipse>
-                    <Ellipse.Fill>
-                            <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"/>
-        </StackPanel>
-        <StackPanel Orientation="Horizontal"
-                    HorizontalAlignment="Right">
-            <wd: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"
-                               VerticalAlignment="Center" HorizontalAlignment="Left" 
-                               GradientStopColor1="#FF00cec9" GradientStopColor2="#2000cec9"
-                               Margin="10,0">
-                <Ellipse>
-                    <Ellipse.Fill>
-                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png"/>
-                    </Ellipse.Fill>
-                </Ellipse>
-            </wd:BreathLamp>
-        </StackPanel>
+        <UniformGrid x:Name="MyUniformGrid" Columns="2">
+            <StackPanel Orientation="Horizontal">
+                <wd:BreathLamp
+                    Width="60"
+                    Height="60"
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    IsLampStart="true"
+                    LampEffect="Ripple">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg" />
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wd:BreathLamp>
+                <wd:AnimationAudio
+                    x:Name="AnimationAudioLeft"
+                    wd:ElementHelper.CornerRadius="4"
+                    MouseDown="AnimationAudioLeft_MouseDown" />
+            </StackPanel>
+            <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                <wd:AnimationAudio
+                    x:Name="AnimationAudioRight"
+                    Background="{DynamicResource WD.SuccessSolidColorBrush}"
+                    Foreground="Black"
+                    IsRight="true"
+                    MouseDown="AnimationAudioLeft_MouseDown" />
+                <wd:BreathLamp
+                    Width="60"
+                    Height="60"
+                    Margin="10,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    GradientStopColor1="#FF00cec9"
+                    GradientStopColor2="#2000cec9"
+                    IsLampStart="True"
+                    LampEffect="Streamer">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                            <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png" />
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wd:BreathLamp>
+            </StackPanel>
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/AnimationAudioExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 9f0d1808ba86e59f7c6979488103cfe6c1f3c019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:54:09 +0800
Subject: [PATCH 061/123] Update App.xaml

---
 src/WPFDevelopers.Samples.Shared/App.xaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
index 39a3bf78..ae72f250 100644
--- a/src/WPFDevelopers.Samples.Shared/App.xaml
+++ b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -31,6 +31,7 @@
                 <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 Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/Loadings/StreamerLoading.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="avalonedit:TextEditor">
                 <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />

From d514848f7f0f7afeac3dd52f8deda9c526fbfc2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:54:25 +0800
Subject: [PATCH 062/123] Update ChartPieExample.xaml.cs

---
 .../ExampleViews/ChartPieExample.xaml.cs                     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
index 4a02bb14..4607ce28 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartPieExample.xaml.cs
@@ -1,10 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Net.NetworkInformation;
 using System.Windows;
 using System.Windows.Controls;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Rebar;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {

From 687a616327f2e66cc0b2e1eab0396ad87bf88b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:54:30 +0800
Subject: [PATCH 063/123] Update BasicControlsExample.xaml

---
 .../ExampleViews/BasicControlsExample.xaml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 5dfd64b4..c332ed42 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -56,7 +56,7 @@
                         Margin="0,20,0,0"
                         FontSize="20"
                         Text="Theme" />
-                    <wd:ThemeControl Margin="0,10" ItemsSource="{Binding ThemesCollection, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWayToSource}" />
+                    <wd:Theme Margin="0,10" ItemsSource="{Binding ThemesCollection, RelativeSource={RelativeSource AncestorType=UserControl}, Mode=OneWayToSource}" />
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"

From c213c7698ed34d61a516c52db16fb67c70c3c133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:54:46 +0800
Subject: [PATCH 064/123] Delete Styles.ThemeControl.xaml

---
 .../Styles/Styles.ThemeControl.xaml           | 75 -------------------
 1 file changed, 75 deletions(-)
 delete mode 100644 src/WPFDevelopers.Shared/Styles/Styles.ThemeControl.xaml

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ThemeControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ThemeControl.xaml
deleted file mode 100644
index 8677c423..00000000
--- a/src/WPFDevelopers.Shared/Styles/Styles.ThemeControl.xaml
+++ /dev/null
@@ -1,75 +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.Controls"
-    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.ThemeControl" TargetType="{x:Type controls:ThemeControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:ThemeControl}">
-                    <ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:ThemeControl}}">
-                        <ItemsControl.ItemTemplate>
-                            <DataTemplate>
-                                <RadioButton
-                                    Width="40"
-                                    Height="40"
-                                    Margin="4,0"
-                                    Cursor="Hand"
-                                    IsChecked="{Binding IsChecked}">
-                                    <RadioButton.Style>
-                                        <Style TargetType="{x:Type RadioButton}">
-                                            <Setter Property="Template">
-                                                <Setter.Value>
-                                                    <ControlTemplate TargetType="{x:Type RadioButton}">
-                                                        <Border
-                                                            x:Name="PART_Border"
-                                                            Padding="2"
-                                                            BorderBrush="{Binding Color}"
-                                                            BorderThickness="0">
-                                                            <controls:SmallPanel Background="{x:Null}">
-                                                                <Rectangle x:Name="PART_Rectangle" Fill="{Binding Color}" />
-                                                                <Path
-                                                                    Width="12"
-                                                                    Height="10"
-                                                                    Margin="0,0,4,4"
-                                                                    HorizontalAlignment="Right"
-                                                                    VerticalAlignment="Bottom"
-                                                                    Data="{StaticResource WD.CheckMarkGeometry}"
-                                                                    Fill="{DynamicResource WD.BackgroundSolidColorBrush}"
-                                                                    Stretch="Fill"
-                                                                    Visibility="{Binding IsChecked, Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-                                                            </controls:SmallPanel>
-                                                        </Border>
-                                                        <ControlTemplate.Triggers>
-                                                            <Trigger Property="IsMouseOver" Value="True">
-                                                                <Setter TargetName="PART_Rectangle" Property="Opacity" Value=".8" />
-                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
-                                                            </Trigger>
-                                                            <Trigger Property="IsChecked" Value="True">
-                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
-                                                            </Trigger>
-                                                        </ControlTemplate.Triggers>
-                                                    </ControlTemplate>
-                                                </Setter.Value>
-                                            </Setter>
-                                        </Style>
-                                    </RadioButton.Style>
-                                </RadioButton>
-                            </DataTemplate>
-                        </ItemsControl.ItemTemplate>
-                        <ItemsControl.ItemsPanel>
-                            <ItemsPanelTemplate>
-                                <WrapPanel />
-                            </ItemsPanelTemplate>
-                        </ItemsControl.ItemsPanel>
-                    </ItemsControl>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <Style BasedOn="{StaticResource WD.ThemeControl}" TargetType="{x:Type controls:ThemeControl}" />
-</ResourceDictionary>
\ No newline at end of file

From 7ea206a8e4b82be2e010cc8eb7b9ed5832bf3df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:13 +0800
Subject: [PATCH 065/123] Delete ThemeControl.cs

---
 .../Controls/ThemeControl/ThemeControl.cs     | 156 ------------------
 1 file changed, 156 deletions(-)
 delete mode 100644 src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeControl.cs

diff --git a/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeControl.cs b/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeControl.cs
deleted file mode 100644
index 9ff885bf..00000000
--- a/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeControl.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Controls
-{
-    public class ThemeControl : Control
-    {
-        public static readonly DependencyProperty ItemsSourceProperty =
-            DependencyProperty.Register("ItemsSource", typeof(ObservableCollection<ThemeModel>), typeof(ThemeControl),
-                new PropertyMetadata(null));
-
-        static ThemeControl()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ThemeControl),
-                new FrameworkPropertyMetadata(typeof(ThemeControl)));
-        }
-
-        public ObservableCollection<ThemeModel> ItemsSource
-        {
-            get => (ObservableCollection<ThemeModel>)GetValue(ItemsSourceProperty);
-            set => SetValue(ItemsSourceProperty, value);
-        }
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            ItemsSource = new ObservableCollection<ThemeModel>();
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#409EFF",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"
-            });
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#FF033E",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Red.xaml"
-            });
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#A21BFC",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Purple.xaml"
-            });
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#FE9426",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Orange.xaml"
-            });
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#00B050",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Green.xaml"
-            });
-            ItemsSource.Add(new ThemeModel
-            {
-                Color = "#FF007F",
-                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Pink.xaml"
-            });
-            if (ThemeCache.ThemesDictCache.Count > 0)
-                foreach (var item in ThemeCache.ThemesDictCache)
-                    if (ItemsSource.Any(x => x.Color != item.Key))
-                        ItemsSource.Add(item.Value);
-            SelectChecked();
-            ItemsSource.CollectionChanged += ItemsSource_CollectionChanged;
-            foreach (var theme in ItemsSource)
-                theme.PropertyChanged += Theme_PropertyChanged;
-        }
-
-        private void SelectChecked()
-        {
-            var existsTheme = ItemsSource.FirstOrDefault(y =>
-                Application.Current.Resources.MergedDictionaries.ToList().Exists(j =>
-                    j.Source != null && y.ResourcePath.Contains(j.Source.AbsoluteUri)));
-
-            if (existsTheme != null)
-                existsTheme.IsChecked = true;
-        }
-
-        private void ItemsSource_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
-        {
-            switch (e.Action)
-            {
-                case NotifyCollectionChangedAction.Add:
-                    foreach (ThemeModel item in e.NewItems)
-                    {
-                        if (!ThemeCache.ThemesDictCache.ContainsKey(item.Color))
-                            ThemeCache.ThemesDictCache.Add(item.Color, item);
-                        item.PropertyChanged += Theme_PropertyChanged;
-                        SelectChecked();
-                        if (!item.IsChecked) return;
-                        ReviseTheme(item);
-                    }
-
-                    break;
-                case NotifyCollectionChangedAction.Remove:
-                    foreach (ThemeModel item in e.NewItems)
-                        if (ThemeCache.ThemesDictCache.ContainsKey(item.Color))
-                            ThemeCache.ThemesDictCache.Remove(item.Color);
-                    break;
-                case NotifyCollectionChangedAction.Replace:
-                    break;
-                case NotifyCollectionChangedAction.Move:
-                    break;
-                case NotifyCollectionChangedAction.Reset:
-                    break;
-            }
-        }
-
-
-        private void Theme_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(ThemeModel.IsChecked))
-            {
-                var theme = sender as ThemeModel;
-                if (!theme.IsChecked) return;
-                ReviseTheme(theme);
-            }
-        }
-
-        private void ReviseTheme(ThemeModel theme)
-        {
-            if (theme == null) return;
-
-            var old = ItemsSource.FirstOrDefault(x => x.IsChecked && x.Color != theme.Color);
-            if (old != null)
-            {
-                ItemsSource.Where(y => !y.Color.Equals(theme.Color) && y.IsChecked).ToList()
-                    .ForEach(h => h.IsChecked = false);
-                var existingResourceDictionary =
-                    Application.Current.Resources.MergedDictionaries.FirstOrDefault(x =>
-                        x.Source != null && x.Source.Equals(old.ResourcePath));
-                if (existingResourceDictionary != null)
-                    Application.Current.Resources.MergedDictionaries.Remove(existingResourceDictionary);
-                var newResource =
-                    Application.Current.Resources.MergedDictionaries.FirstOrDefault(x =>
-                        x.Source != null && x.Source.Equals(theme.ResourcePath));
-                if (newResource != null) return;
-                var newResourceDictionary = new ResourceDictionary { Source = new Uri(theme.ResourcePath) };
-                Application.Current.Resources.MergedDictionaries.Insert(0, newResourceDictionary);
-                ControlsHelper.ThemeRefresh();
-            }
-        }
-    }
-
-    public class ThemeCache
-    {
-        public static Dictionary<string, ThemeModel> ThemesDictCache = new Dictionary<string, ThemeModel>();
-    }
-}
\ No newline at end of file

From b07b9b06c5014f41939920bd49bd8711f32139dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:18 +0800
Subject: [PATCH 066/123] Delete ThemeModel.cs

---
 .../Controls/ThemeControl/ThemeModel.cs       | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeModel.cs

diff --git a/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeModel.cs b/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeModel.cs
deleted file mode 100644
index 0fb5830d..00000000
--- a/src/WPFDevelopers.Shared/Controls/ThemeControl/ThemeModel.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Controls
-{
-    public class ThemeModel : ViewModelBase
-    {
-        private bool _isChecked;
-
-        /// <summary>
-        ///     whether to choose
-        /// </summary>
-        public bool IsChecked
-        {
-            get => _isChecked;
-            set
-            {
-                _isChecked = value;
-                NotifyPropertyChange("IsChecked");
-            }
-        }
-
-        /// <summary>
-        ///     display color
-        /// </summary>
-        public string Color { get; set; }
-
-        /// <summary>
-        ///     resource path
-        /// </summary>
-        public string ResourcePath { get; set; }
-    }
-}
\ No newline at end of file

From 8eae450062580df06c7c7788d2ce9f3e6586298e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:38 +0800
Subject: [PATCH 067/123] Create Theme

Create Theme
---
 .../Controls/Theme/Theme.cs                   | 156 ++++++++++++++++++
 .../Controls/Theme/ThemeModel.cs              |  32 ++++
 .../Styles/Styles.Theme.xaml                  |  75 +++++++++
 3 files changed, 263 insertions(+)
 create mode 100644 src/WPFDevelopers.Shared/Controls/Theme/Theme.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Theme/ThemeModel.cs
 create mode 100644 src/WPFDevelopers.Shared/Styles/Styles.Theme.xaml

diff --git a/src/WPFDevelopers.Shared/Controls/Theme/Theme.cs b/src/WPFDevelopers.Shared/Controls/Theme/Theme.cs
new file mode 100644
index 00000000..a36caf6d
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Theme/Theme.cs
@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public class Theme : Control
+    {
+        public static readonly DependencyProperty ItemsSourceProperty =
+            DependencyProperty.Register("ItemsSource", typeof(ObservableCollection<ThemeModel>), typeof(Theme),
+                new PropertyMetadata(null));
+
+        static Theme()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Theme),
+                new FrameworkPropertyMetadata(typeof(Theme)));
+        }
+
+        public ObservableCollection<ThemeModel> ItemsSource
+        {
+            get => (ObservableCollection<ThemeModel>)GetValue(ItemsSourceProperty);
+            set => SetValue(ItemsSourceProperty, value);
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            ItemsSource = new ObservableCollection<ThemeModel>();
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#409EFF",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Blue.xaml"
+            });
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#FF033E",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Red.xaml"
+            });
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#A21BFC",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Purple.xaml"
+            });
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#FE9426",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Orange.xaml"
+            });
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#00B050",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Green.xaml"
+            });
+            ItemsSource.Add(new ThemeModel
+            {
+                Color = "#FF007F",
+                ResourcePath = "pack://application:,,,/WPFDevelopers;component/Themes/Light.Pink.xaml"
+            });
+            if (ThemeCache.ThemesDictCache.Count > 0)
+                foreach (var item in ThemeCache.ThemesDictCache)
+                    if (ItemsSource.Any(x => x.Color != item.Key))
+                        ItemsSource.Add(item.Value);
+            SelectChecked();
+            ItemsSource.CollectionChanged += ItemsSource_CollectionChanged;
+            foreach (var theme in ItemsSource)
+                theme.PropertyChanged += Theme_PropertyChanged;
+        }
+
+        private void SelectChecked()
+        {
+            var existsTheme = ItemsSource.FirstOrDefault(y =>
+                Application.Current.Resources.MergedDictionaries.ToList().Exists(j =>
+                    j.Source != null && y.ResourcePath.Contains(j.Source.AbsoluteUri)));
+
+            if (existsTheme != null)
+                existsTheme.IsChecked = true;
+        }
+
+        private void ItemsSource_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            switch (e.Action)
+            {
+                case NotifyCollectionChangedAction.Add:
+                    foreach (ThemeModel item in e.NewItems)
+                    {
+                        if (!ThemeCache.ThemesDictCache.ContainsKey(item.Color))
+                            ThemeCache.ThemesDictCache.Add(item.Color, item);
+                        item.PropertyChanged += Theme_PropertyChanged;
+                        SelectChecked();
+                        if (!item.IsChecked) return;
+                        ReviseTheme(item);
+                    }
+
+                    break;
+                case NotifyCollectionChangedAction.Remove:
+                    foreach (ThemeModel item in e.NewItems)
+                        if (ThemeCache.ThemesDictCache.ContainsKey(item.Color))
+                            ThemeCache.ThemesDictCache.Remove(item.Color);
+                    break;
+                case NotifyCollectionChangedAction.Replace:
+                    break;
+                case NotifyCollectionChangedAction.Move:
+                    break;
+                case NotifyCollectionChangedAction.Reset:
+                    break;
+            }
+        }
+
+
+        private void Theme_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(ThemeModel.IsChecked))
+            {
+                var theme = sender as ThemeModel;
+                if (!theme.IsChecked) return;
+                ReviseTheme(theme);
+            }
+        }
+
+        private void ReviseTheme(ThemeModel theme)
+        {
+            if (theme == null) return;
+
+            var old = ItemsSource.FirstOrDefault(x => x.IsChecked && x.Color != theme.Color);
+            if (old != null)
+            {
+                ItemsSource.Where(y => !y.Color.Equals(theme.Color) && y.IsChecked).ToList()
+                    .ForEach(h => h.IsChecked = false);
+                var existingResourceDictionary =
+                    Application.Current.Resources.MergedDictionaries.FirstOrDefault(x =>
+                        x.Source != null && x.Source.Equals(old.ResourcePath));
+                if (existingResourceDictionary != null)
+                    Application.Current.Resources.MergedDictionaries.Remove(existingResourceDictionary);
+                var newResource =
+                    Application.Current.Resources.MergedDictionaries.FirstOrDefault(x =>
+                        x.Source != null && x.Source.Equals(theme.ResourcePath));
+                if (newResource != null) return;
+                var newResourceDictionary = new ResourceDictionary { Source = new Uri(theme.ResourcePath) };
+                Application.Current.Resources.MergedDictionaries.Insert(0, newResourceDictionary);
+                ControlsHelper.ThemeRefresh();
+            }
+        }
+    }
+
+    public class ThemeCache
+    {
+        public static Dictionary<string, ThemeModel> ThemesDictCache = new Dictionary<string, ThemeModel>();
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Theme/ThemeModel.cs b/src/WPFDevelopers.Shared/Controls/Theme/ThemeModel.cs
new file mode 100644
index 00000000..0fb5830d
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Theme/ThemeModel.cs
@@ -0,0 +1,32 @@
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public class ThemeModel : ViewModelBase
+    {
+        private bool _isChecked;
+
+        /// <summary>
+        ///     whether to choose
+        /// </summary>
+        public bool IsChecked
+        {
+            get => _isChecked;
+            set
+            {
+                _isChecked = value;
+                NotifyPropertyChange("IsChecked");
+            }
+        }
+
+        /// <summary>
+        ///     display color
+        /// </summary>
+        public string Color { get; set; }
+
+        /// <summary>
+        ///     resource path
+        /// </summary>
+        public string ResourcePath { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Theme.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Theme.xaml
new file mode 100644
index 00000000..8c8bfd32
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Theme.xaml
@@ -0,0 +1,75 @@
+<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: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.Theme" TargetType="{x:Type controls:Theme}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Theme}">
+                    <ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:Theme}}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <RadioButton
+                                    Width="40"
+                                    Height="40"
+                                    Cursor="Hand"
+                                    IsChecked="{Binding IsChecked}">
+                                    <RadioButton.Style>
+                                        <Style TargetType="{x:Type RadioButton}">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                                                        <Border
+                                                            x:Name="PART_Border"
+                                                            Padding="2"
+                                                            BorderBrush="{Binding Color}"
+                                                            BorderThickness="0">
+                                                            <controls:SmallPanel Background="{x:Null}">
+                                                                <Rectangle x:Name="PART_Rectangle" Fill="{Binding Color}" />
+                                                                <Path
+                                                                    Width="12"
+                                                                    Height="10"
+                                                                    Margin="0,0,4,4"
+                                                                    HorizontalAlignment="Right"
+                                                                    VerticalAlignment="Bottom"
+                                                                    Data="{StaticResource WD.CheckMarkGeometry}"
+                                                                    Fill="{DynamicResource WD.BackgroundSolidColorBrush}"
+                                                                    Stretch="Fill"
+                                                                    Visibility="{Binding IsChecked, Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                                            </controls:SmallPanel>
+                                                        </Border>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="IsMouseOver" Value="True">
+                                                                <Setter TargetName="PART_Rectangle" Property="Opacity" Value=".8" />
+                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
+                                                            </Trigger>
+                                                            <Trigger Property="IsChecked" Value="True">
+                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </RadioButton.Style>
+                                </RadioButton>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel helpers:PanelHelper.Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                    </ItemsControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.Theme}" TargetType="{x:Type controls:Theme}" />
+</ResourceDictionary>
\ No newline at end of file

From bc89d5b29a42d8be7c2d11ab140517e60c7d41d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:47 +0800
Subject: [PATCH 068/123] Update BallLoadingExample.xaml

---
 .../ExampleViews/Loading/BallLoadingExample.xaml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
index f484f9ab..900a53d2 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
+        <StackPanel wd:PanelHelper.Spacing="4">
             <CheckBox
                 x:Name="MyCheckBox"
                 HorizontalAlignment="Center"

From 89be9bf03009bc50bcb4f8fa2e7e369b46cc001b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:51 +0800
Subject: [PATCH 069/123] Update CycleLoadingExample.xaml

---
 .../ExampleViews/Loading/CycleLoadingExample.xaml               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
index a3987a35..c2891db6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
+        <StackPanel wd:PanelHelper.Spacing="4">
             <CheckBox
                 x:Name="MyCheckBox"
                 HorizontalAlignment="Center"

From 79200abfe73e0e63243743fd462edf087283191e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:54 +0800
Subject: [PATCH 070/123] Update RingLoadingExample.xaml

---
 .../ExampleViews/Loading/RingLoadingExample.xaml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
index b88cca0d..e644b6f6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
@@ -11,7 +11,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
+        <StackPanel wd:PanelHelper.Spacing="4">
             <CheckBox
                 x:Name="MyCheckBox"
                 HorizontalAlignment="Center"

From ad5dc1fa563e98b294fedb5c9896b8b666be9ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:55:57 +0800
Subject: [PATCH 071/123] Update RollLoadingExample.xaml

---
 .../ExampleViews/Loading/RollLoadingExample.xaml                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
index fa45b205..d6a8b0f8 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
+        <StackPanel wd:PanelHelper.Spacing="4">
             <CheckBox
                 x:Name="MyCheckBox"
                 HorizontalAlignment="Center"

From e062fc3ffe9dd9b1ccf7fbb61744c866ab02a998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:56:00 +0800
Subject: [PATCH 072/123] Update StreamerLoadingExample.xaml

---
 .../ExampleViews/Loading/StreamerLoadingExample.xaml            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
index d08d9f5d..b2185907 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
@@ -10,7 +10,7 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
+        <StackPanel wd:PanelHelper.Spacing="4">
             <CheckBox
                 x:Name="MyCheckBox"
                 HorizontalAlignment="Center"

From 85fe9050addcb440e2bc650dc9f1f7ab194f840b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:56:03 +0800
Subject: [PATCH 073/123] Update WaitLoadingExample.xaml

---
 .../ExampleViews/Loading/WaitLoadingExample.xaml           | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
index 94b6e23e..b5e6ee70 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
@@ -10,8 +10,11 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <StackPanel>
-            <CheckBox x:Name="MyCheckBox" Content="IsLoading" />
+        <StackPanel wd:PanelHelper.Spacing="4">
+            <CheckBox
+                x:Name="MyCheckBox"
+                HorizontalAlignment="Center"
+                Content="IsLoading" />
             <wd:WaitLoading HorizontalAlignment="Center" IsLoading="{Binding ElementName=MyCheckBox, Path=IsChecked}" />
         </StackPanel>
         <controls:CodeViewer.SourceCodes>

From 28fb51aaeef1f066958765f8e4485f99e7a4f431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:56:12 +0800
Subject: [PATCH 074/123] Update MaskExample.xaml

---
 .../ExampleViews/MaskExample.xaml             | 65 ++++++++++---------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MaskExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MaskExample.xaml
index fc0e4ee7..7d540517 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MaskExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MaskExample.xaml
@@ -1,43 +1,48 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.MaskExample"
-             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:wd="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">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.MaskExample"
+    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>
         <StackPanel Margin="10">
-            <ToggleButton Name="ToggleButtonMask"/>
-            <Border Background="LawnGreen" Height="200"
-                    wd:Mask.IsShow="{Binding ElementName=ToggleButtonMask,Path=IsChecked}"
-                    Margin="10">
+            <ToggleButton Name="ToggleButtonMask" />
+            <Border
+                Height="200"
+                Margin="10"
+                wd:Mask.IsShow="{Binding ElementName=ToggleButtonMask, Path=IsChecked}"
+                Background="LawnGreen">
                 <wd:Mask.Child>
                     <Border>
-                        <TextBox wd:ElementHelper.Watermark="我是蒙板输入框"/>
+                        <TextBox wd:ElementHelper.Watermark="我是蒙板输入框" />
                     </Border>
                 </wd:Mask.Child>
-                <Button Content="Mask" 
-                        VerticalAlignment="Center" 
-                        HorizontalAlignment="Center"/>
+                <Button
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Content="Mask" />
             </Border>
-            <StackPanel Orientation="Horizontal"
-                    HorizontalAlignment="Center">
-                <Button Content="MaskShowDialog" Style="{StaticResource WD.DangerPrimaryButton}" 
-                        Click="Button_Click"/>
-                <Button Content="MaskShow" Margin="10,0" Click="Button_Click_1"/>
+            <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
+                <Button
+                    Click="Button_Click"
+                    Content="MaskShowDialog"
+                    Style="{StaticResource WD.DangerPrimaryButton}" />
+                <Button
+                    Margin="10,0"
+                    Click="Button_Click_1"
+                    Content="MaskShow" />
             </StackPanel>
-            
+
         </StackPanel>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MaskExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MaskExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MaskExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/MaskExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From 826a92505edb63493e1f0ca202d050378c573f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:56:21 +0800
Subject: [PATCH 075/123] Update NumericBoxExample.xaml

---
 .../ExampleViews/NumericBoxExample.xaml                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
index bc9d8342..a491b5b5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
@@ -12,6 +12,7 @@
     mc:Ignorable="d">
     <controls:CodeViewer>
         <UniformGrid
+            Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Rows="1">
@@ -23,7 +24,6 @@
             <wd:NumericBox
                 Width="100"
                 Height="40"
-                Margin="10,0"
                 Maximum="1000"
                 Minimum="100"
                 UpDownButtonsWidth="0" />

From 8edcf64516918fc00603c6237b7a01bc77985e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:56:24 +0800
Subject: [PATCH 076/123] Update PathIconExample.xaml

---
 .../ExampleViews/PathIconExample.xaml         | 45 +++++--------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/PathIconExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/PathIconExample.xaml
index 8d08c5bf..88b42930 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/PathIconExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/PathIconExample.xaml
@@ -14,40 +14,25 @@
         <UniformGrid
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
+            wd:PanelHelper.Spacing="4"
             Columns="6"
             Rows="2">
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.PrimaryButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.PrimaryButton}">
                 <wd:PathIcon Data="M682 256h256v256l-98-98-268 268-170-170-256 256-60-60 316-316 170 170 208-208z" />
             </Button>
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.DangerPrimaryButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.DangerPrimaryButton}">
                 <wd:PathIcon Kind="Arrow" />
             </Button>
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.DangerDefaultButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.DangerDefaultButton}">
                 <wd:PathIcon Kind="SortArrow" />
             </Button>
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.WarningDefaultButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.WarningDefaultButton}">
                 <wd:PathIcon Kind="SmileyOutline" />
             </Button>
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.DefaultButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.DefaultButton}">
                 <wd:PathIcon Kind="Replace" />
             </Button>
             <Button
-                Margin="4"
                 wd:Badge.HorizontalOffset="-20"
                 wd:Badge.IsShow="True"
                 wd:Badge.VerticalOffset="8"
@@ -55,31 +40,25 @@
                 Style="{StaticResource WD.SuccessDefaultButton}">
                 <wd:PathIcon Kind="Home" />
             </Button>
-            <Button
-                Margin="4"
-                wd:ElementHelper.IsRound="True"
-                Style="{StaticResource WD.NormalButton}">
+            <Button wd:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}">
                 <wd:PathIcon Data="M682 256h256v256l-98-98-268 268-170-170-256 256-60-60 316-316 170 170 208-208z" />
             </Button>
-            <Button Margin="4" Style="{StaticResource WD.SuccessPrimaryButton}">
+            <Button Style="{StaticResource WD.SuccessPrimaryButton}">
                 <wd:PathIcon Kind="Arrow" />
             </Button>
-            <Button Margin="4" Style="{StaticResource WD.DangerPrimaryButton}">
+            <Button Style="{StaticResource WD.DangerPrimaryButton}">
                 <wd:PathIcon Kind="SortArrow" />
             </Button>
-            <Button
-                Margin="4"
-                wd:Badge.IsShow="True"
-                Style="{StaticResource WD.WarningPrimaryButton}">
+            <Button wd:Badge.IsShow="True" Style="{StaticResource WD.WarningPrimaryButton}">
                 <wd:PathIcon
                     Width="20"
                     Height="20"
                     Kind="SmileyOutline" />
             </Button>
-            <Button Margin="4" Style="{StaticResource WD.PrimaryButton}">
+            <Button Style="{StaticResource WD.PrimaryButton}">
                 <wd:PathIcon Kind="Replace" />
             </Button>
-            <Button Margin="4" Style="{StaticResource WD.SuccessPrimaryButton}">
+            <Button Style="{StaticResource WD.SuccessPrimaryButton}">
                 <StackPanel Orientation="Horizontal">
                     <wd:PathIcon Kind="Home" />
                     <TextBlock Margin="4,0" Text="Home" />

From 72c15dd9f7a699c12ef05fbed5de67d976339168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:03 +0800
Subject: [PATCH 077/123] Update WPFDevelopers.Samples.Shared.projitems

---
 .../WPFDevelopers.Samples.Shared.projitems                   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index bdf4b191..918e71c7 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -25,6 +25,7 @@
     <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\Loadings\StreamerLoading.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\NavigateMenu\NavigateMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\ElementAdorner.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\ThumbAngle.cs" />
@@ -491,6 +492,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Controls\Loadings\StreamerLoading.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Controls\NavigateMenu\NavigateMenu.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 7623b0fb99ace1bceb46f063b63214173e666743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:14 +0800
Subject: [PATCH 078/123] Update WPFDevelopers.SamplesCode.csproj

---
 .../WPFDevelopers.SamplesCode.csproj                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 2b61d3f5..a03a400e 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -145,6 +145,7 @@
 		<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" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\\Loadings\StreamerLoading.cs" Link="Controls\Loadings\StreamerLoading.cs"/>
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -492,5 +493,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml">
 			<Link>ExampleViews\ChartPieExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\Loadings\StreamerLoading.xaml">
+			<Link>Controls\Loadings\StreamerLoading.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>

From fbb595d0c8adb6c7775d1a511c5775830c7d7429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:23 +0800
Subject: [PATCH 079/123] Update ChartBar.cs

---
 src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
index c1e31d20..ba597c7b 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Media;
+using WPFDevelopers.Core;
 
 namespace WPFDevelopers.Controls
 {
@@ -17,15 +18,18 @@ protected override void OnRender(DrawingContext drawingContext)
             {
                 var formattedText = DrawingContextHelper.GetFormattedText(item.Key,
                     ChartFill, FlowDirection.LeftToRight);
-                drawingContext.DrawText(formattedText, new Point(x + interval / 2 - formattedText.Width / 2, StartY + 4));
+                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.ToString("#,##0.#########################")}");
+                var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding, rect.Width + EllipsePadding,
+                    rect.Height + EllipsePadding);
+                dicts.Add(nRect, $"{item.Key} : {item.Value.FormatNumber()}");
             }
+
             PointCache = dicts;
         }
     }

From 991b4621b3b496aa8a3f9f8cd7112d4eb6343ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:26 +0800
Subject: [PATCH 080/123] Update ChartBase.cs

---
 .../Controls/Charts/ChartBase.cs              | 40 +++++++++----------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
index cc3bfb86..13996c43 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -13,17 +12,17 @@ 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));
 
+        private Border _border;
+        private KeyValuePair<Rect, string> _lastItem;
+        private Popup _popup;
+        private TextBlock _textBlock;
+        private bool isPopupOpen;
+        public IDictionary<Rect, string> PointCache;
+
         static ChartBase()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ChartBase),
@@ -31,7 +30,7 @@ static ChartBase()
         }
 
         protected double EllipseSize { get; } = 7;
-        protected double EllipsePadding{ get; } = 20;
+        protected double EllipsePadding { get; } = 20;
         protected double Rows { get; } = 5;
 
         protected double Interval { get; } = 120;
@@ -55,6 +54,7 @@ private static void DatasChanged(DependencyObject d, DependencyPropertyChangedEv
             if (e.NewValue != null)
                 ctrl.InvalidateVisual();
         }
+
         protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
@@ -67,35 +67,30 @@ protected override void OnMouseMove(MouseEventArgs e)
                     AllowsTransparency = true,
                     Placement = PlacementMode.MousePoint,
                     PlacementTarget = this,
-                    StaysOpen = false,
+                    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()
+                _popup.Closed += delegate { isPopupOpen = false; };
+                _textBlock = new TextBlock
                 {
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
-                    Foreground = (Brush)Application.Current.TryFindResource("WD.WindowForegroundColorBrush")
+                    Foreground = (Brush) Application.Current.TryFindResource("WD.WindowForegroundColorBrush")
                 };
                 _border = new Border
                 {
                     Child = _textBlock,
-                    Background = (Brush)Application.Current.TryFindResource("WD.ChartFillSolidColorBrush"),
+                    Background = (Brush) Application.Current.TryFindResource("WD.ChartFillSolidColorBrush"),
                     Effect = Application.Current.TryFindResource("WD.PopupShadowDepth") as DropShadowEffect,
                     Margin = new Thickness(10),
                     CornerRadius = new CornerRadius(3),
@@ -103,6 +98,7 @@ protected override void OnMouseMove(MouseEventArgs e)
                 };
                 _popup.Child = _border;
             }
+
             if (PointCache == null) return;
             var currentPoint = e.GetPosition(this);
             if (PointCache.Any(x => x.Key.Contains(currentPoint)))
@@ -135,9 +131,9 @@ public void DrawEllipse(IEnumerable<Rect> rects, DrawingContext drawingContext)
             };
             drawingPen.Freeze();
 
-            var backgroupBrush = new SolidColorBrush()
+            var backgroupBrush = new SolidColorBrush
             {
-                Color = (Color)Application.Current.TryFindResource("WD.BackgroundColor")
+                Color = (Color) Application.Current.TryFindResource("WD.BackgroundColor")
             };
             backgroupBrush.Freeze();
             foreach (var item in rects)

From 6ea6bc0161cb477053664ce66d9790bc8894392e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:28 +0800
Subject: [PATCH 081/123] Update ChartLine.cs

---
 .../Controls/Charts/ChartLine.cs              | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
index 1df0244c..fa2e55e4 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
@@ -1,8 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using WPFDevelopers.Core;
 
 namespace WPFDevelopers.Controls
 {
@@ -27,18 +27,18 @@ protected override void OnRender(DrawingContext drawingContext)
             var firstDataPoint = Datas.FirstOrDefault();
             if (firstDataPoint.Equals(default(KeyValuePair<string, double>)))
                 return;
-            double proportion = firstDataPoint.Value / IntervalY;
-            double yPositionFromBottom = StartY - proportion * (ScaleFactor * Rows);
+            var proportion = firstDataPoint.Value / IntervalY;
+            var 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);
+                    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 y = StartY - item.Value / IntervalY * (ScaleFactor * Rows);
                 var endPoint = new Point(x + Interval / 2, y);
                 points.Add(endPoint);
                 drawingContext.DrawLine(drawingPen, startPoint, endPoint);
@@ -47,30 +47,34 @@ protected override void OnRender(DrawingContext drawingContext)
                 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.ToString("#,##0.#########################")}");
+                var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding, rect.Width + EllipsePadding,
+                    rect.Height + EllipsePadding);
+                dicts.Add(nRect, $"{item.Key} : {item.Value.FormatNumber()}");
             }
+
             PointCache = dicts;
-            if(points.Count > 1)
+            if (points.Count > 1)
             {
-                var color = (Color)Application.Current.TryFindResource("WD.PrimaryNormalColor");
+                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())
+                using (var geometryContext = streamGeometry.Open())
                 {
                     var sPoint = new Point(points[0].X, StartY);
                     geometryContext.BeginFigure(sPoint, true, true);
 
-                    foreach (Point point in points)
+                    foreach (var 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);
         }
     }

From 2639106a94fe109e972afb5f754ceb49a05f2487 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:30 +0800
Subject: [PATCH 082/123] Update ChartPie.cs

---
 .../Controls/Charts/ChartPie.cs               | 124 ++++++++----------
 1 file changed, 57 insertions(+), 67 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs
index 43a0877c..dc3c6f91 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartPie.cs
@@ -4,47 +4,35 @@
 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.Media.Effects;
 using System.Windows.Shapes;
+using WPFDevelopers.Core;
 
 namespace WPFDevelopers.Controls
 {
     public class ChartPie : Control
     {
-        private double centerX, centerY, radius;
-        private Popup _popup;
+        public static readonly DependencyProperty DatasProperty =
+            DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>),
+                typeof(ChartPie), new UIPropertyMetadata(DatasChanged));
+
         private Border _border;
-        private StackPanel _stackPanel;
-        private TextBlock _textBlock;
         private Ellipse _ellipse;
-        private bool isPopupOpen = false;
         private KeyValuePair<PathGeometry, string> _lastItem;
-        private Dictionary<PathGeometry, string> pathGeometries = new Dictionary<PathGeometry, string>();
-
-        private Color[] vibrantColors;
-
-        public static readonly DependencyProperty DatasProperty =
-       DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>),
-           typeof(ChartPie), new UIPropertyMetadata(DatasChanged));
-        public IEnumerable<KeyValuePair<string, double>> Datas
-        {
-            get => (IEnumerable<KeyValuePair<string, double>>)GetValue(DatasProperty);
-            set => SetValue(DatasProperty, value);
-        }
+        private Popup _popup;
+        private StackPanel _stackPanel;
+        private TextBlock _textBlock;
+        private double centerX, centerY, radius;
+        private bool isPopupOpen;
+        private readonly Dictionary<PathGeometry, string> pathGeometries = new Dictionary<PathGeometry, string>();
 
-        private static void DatasChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = d as ChartPie;
-            if (e.NewValue != null)
-                ctrl.InvalidateVisual();
-        }
+        private readonly Color[] vibrantColors;
 
         public ChartPie()
         {
-            vibrantColors = new Color[]
+            vibrantColors = new[]
             {
                 Color.FromArgb(255, 84, 112, 198),
                 Color.FromArgb(255, 145, 204, 117),
@@ -54,9 +42,23 @@ public ChartPie()
                 Color.FromArgb(255, 59, 162, 114),
                 Color.FromArgb(255, 252, 132, 82),
                 Color.FromArgb(255, 154, 96, 180),
-                Color.FromArgb(255, 234, 124, 204),
+                Color.FromArgb(255, 234, 124, 204)
             };
         }
+
+        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 ChartPie;
+            if (e.NewValue != null)
+                ctrl.InvalidateVisual();
+        }
+
         protected override void OnMouseMove(MouseEventArgs e)
         {
             base.OnMouseMove(e);
@@ -68,47 +70,42 @@ protected override void OnMouseMove(MouseEventArgs e)
                     AllowsTransparency = true,
                     Placement = PlacementMode.MousePoint,
                     PlacementTarget = this,
-                    StaysOpen = false,
+                    StaysOpen = false
                 };
                 _popup.MouseMove += (y, j) =>
                 {
                     var point = j.GetPosition(this);
                     if (isPopupOpen && _lastItem.Value != null)
-                    {
                         if (!IsMouseOverGeometry(_lastItem.Key))
                         {
                             _popup.IsOpen = false;
                             isPopupOpen = false;
                             _lastItem = new KeyValuePair<PathGeometry, string>();
                         }
-                    }
-                };
-                _popup.Closed += delegate
-                {
-                    isPopupOpen = false;
                 };
+                _popup.Closed += delegate { isPopupOpen = false; };
 
-                _textBlock = new TextBlock()
+                _textBlock = new TextBlock
                 {
                     HorizontalAlignment = HorizontalAlignment.Center,
                     VerticalAlignment = VerticalAlignment.Center,
-                    Foreground = (Brush)Application.Current.TryFindResource("WD.WindowForegroundColorBrush"),
+                    Foreground = (Brush) Application.Current.TryFindResource("WD.WindowForegroundColorBrush"),
                     Padding = new Thickness(4, 0, 2, 0)
                 };
-                _ellipse = new Ellipse()
+                _ellipse = new Ellipse
                 {
                     Width = 10,
                     Height = 10,
-                    Stroke = Brushes.White,
+                    Stroke = Brushes.White
                 };
-                _stackPanel = new StackPanel() { Orientation = Orientation.Horizontal };
+                _stackPanel = new StackPanel {Orientation = Orientation.Horizontal};
                 _stackPanel.Children.Add(_ellipse);
                 _stackPanel.Children.Add(_textBlock);
 
                 _border = new Border
                 {
                     Child = _stackPanel,
-                    Background = (Brush)Application.Current.TryFindResource("WD.ChartFillSolidColorBrush"),
+                    Background = (Brush) Application.Current.TryFindResource("WD.ChartFillSolidColorBrush"),
                     Effect = Application.Current.TryFindResource("WD.PopupShadowDepth") as DropShadowEffect,
                     Margin = new Thickness(10),
                     CornerRadius = new CornerRadius(3),
@@ -116,13 +113,14 @@ protected override void OnMouseMove(MouseEventArgs e)
                 };
                 _popup.Child = _border;
             }
-            int index = 0;
+
+            var index = 0;
             foreach (var pathGeometry in pathGeometries)
             {
                 if (IsMouseOverGeometry(pathGeometry.Key))
                 {
                     isPopupOpen = true;
-                    _ellipse.Fill = new SolidColorBrush()
+                    _ellipse.Fill = new SolidColorBrush
                     {
                         Color = vibrantColors[index >= vibrantColors.Length ? index % vibrantColors.Length : index]
                     };
@@ -135,9 +133,11 @@ protected override void OnMouseMove(MouseEventArgs e)
                     _lastItem = pathGeometry;
                     break;
                 }
+
                 index++;
             }
         }
+
         private bool IsMouseOverGeometry(PathGeometry pathGeometry)
         {
             var mousePosition = Mouse.GetPosition(this);
@@ -166,7 +166,6 @@ protected override void OnRender(DrawingContext drawingContext)
             var isFirst = false;
             foreach (var item in Datas)
             {
-
                 var arcStartX = radius * Math.Cos(angle * Math.PI / 180) + centerX;
                 var arcStartY = radius * Math.Sin(angle * Math.PI / 180) + centerY;
                 angle = item.Value / sum * 360 + prevAngle;
@@ -176,16 +175,16 @@ protected override void OnRender(DrawingContext drawingContext)
                 {
                     isFirst = true;
                     arcEndX = centerX + Math.Cos(359.99999 * Math.PI / 180) * radius;
-                    arcEndY = (radius * Math.Sin(359.99999 * Math.PI / 180)) + centerY;
+                    arcEndY = radius * Math.Sin(359.99999 * Math.PI / 180) + centerY;
                 }
                 else
                 {
                     arcEndX = centerX + Math.Cos(angle * Math.PI / 180) * radius;
-                    arcEndY = (radius * Math.Sin(angle * Math.PI / 180)) + centerY;
+                    arcEndY = radius * Math.Sin(angle * Math.PI / 180) + centerY;
                 }
                 var startPoint = new Point(arcStartX, arcStartY);
                 var line1Segment = new LineSegment(startPoint, false);
-                bool isLargeArc = item.Value / sum > 0.5;
+                var isLargeArc = item.Value / sum > 0.5;
                 var arcSegment = new ArcSegment();
                 var size = new Size(radius, radius);
                 var endPoint = new Point(arcEndX, arcEndY);
@@ -195,23 +194,25 @@ protected override void OnRender(DrawingContext drawingContext)
                 arcSegment.IsLargeArc = isLargeArc;
                 var center = new Point(centerX, centerY);
                 var line2Segment = new LineSegment(center, false);
-
-                var pathGeometry = new PathGeometry(new PathFigure[]
+                var pathGeometry = new PathGeometry(new[]
                 {
-                    new PathFigure(new Point(centerX, centerY), new List<PathSegment>()
+                    new PathFigure(new Point(centerX, centerY), new List<PathSegment>
                     {
                         line1Segment,
                         arcSegment,
-                        line2Segment,
+                        line2Segment
                     }, true)
                 });
-                pathGeometries.Add(pathGeometry, $"{item.Key} : {item.Value.ToString("#,##0.#########################")}");
-                var backgroupBrush = new SolidColorBrush()
+                pathGeometries.Add(pathGeometry,
+                    $"{item.Key} : {item.Value.FormatNumber()}");
+                var backgroupBrush = new SolidColorBrush
                 {
-                    Color = vibrantColors[index >= vibrantColors.Length ? index % vibrantColors.Length : index]//RandomColorGenerator.GenerateRandomColor(),
+                    Color = vibrantColors[
+                        index >= vibrantColors.Length
+                            ? index % vibrantColors.Length
+                            : index]
                 };
                 backgroupBrush.Freeze();
-
                 drawingContext.DrawGeometry(backgroupBrush, null, pathGeometry);
                 index++;
                 if (!isFirst)
@@ -223,28 +224,17 @@ protected override void OnRender(DrawingContext drawingContext)
                 }
                 prevAngle = angle;
             }
-
         }
+
         private Pen CreatePen(double thickness)
         {
             var pen = new Pen
             {
                 Thickness = thickness,
-                Brush = Brushes.White,
+                Brush = Brushes.White
             };
             pen.Freeze();
             return pen;
         }
     }
-    public class RandomColorGenerator
-    {
-        private static Random random = new Random();
-        public static Color GenerateRandomColor()
-        {
-            byte[] rgb = new byte[3];
-            random.NextBytes(rgb);
-            var randomColor = Color.FromArgb(255, rgb[0], rgb[1], rgb[2]);
-            return randomColor;
-        }
-    }
-}
+}
\ No newline at end of file

From 459619c0303da541954b2d17e84562dfe753254e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:33 +0800
Subject: [PATCH 083/123] Update ChartRadar.cs

---
 .../Controls/Charts/ChartRadar.cs             | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
index 1ec8d4fd..55a75504 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
@@ -9,14 +9,16 @@ namespace WPFDevelopers.Controls
 {
     public class ChartRadar : ChartBase
     {
-        private PointCollection _points;
         private double _h, _w;
         private Pen _penXAxis;
+        private PointCollection _points;
+
         static ChartRadar()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(ChartRadar),
                 new FrameworkPropertyMetadata(typeof(ChartRadar)));
         }
+
         protected override void OnRender(DrawingContext drawingContext)
         {
             base.OnRender(drawingContext);
@@ -30,7 +32,7 @@ protected override void OnRender(DrawingContext drawingContext)
             var dicts = new Dictionary<Rect, string>();
             var rects = new List<Rect>();
             var max = Convert.ToInt32(Datas.Max(kvp => kvp.Value)) + 50;
-            double v = StartX;
+            var v = StartX;
             for (var i = 0; i < Rows; i++)
             {
                 DrawPoints(v, drawingContext, i == Rows - 1);
@@ -55,28 +57,33 @@ protected override void OnRender(DrawingContext drawingContext)
                     {
                         var startPoint = _points[index];
                         var point = new Point((startPoint.X - _w) / max * item.Value + _w,
-                        (startPoint.Y - _h) / max * item.Value + _h);
+                            (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);
+                        var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding,
+                            rect.Width + EllipsePadding, rect.Height + EllipsePadding);
                         dicts.Add(nRect, $"{item.Key} : {item.Value}");
                     }
+
                     index++;
                 }
+
                 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 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)
         {
             var pieWidth = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
@@ -93,6 +100,7 @@ private void DrawPoints(double circleRadius, DrawingContext drawingContext, bool
                 geometryContext.BeginFigure(_points[_points.Count - 1], true, true);
                 geometryContext.PolyLineTo(_points, true, true);
             }
+
             streamGeometry.Freeze();
             drawingContext.DrawGeometry(null, _penXAxis, streamGeometry);
         }
@@ -111,8 +119,9 @@ private PointCollection GetPolygonPoint(Point center, double r,
                 if (drawingContext != null)
                 {
                     drawingContext.DrawLine(_penXAxis, p1, p2);
-                    var formattedText = DrawingContextHelper.GetFormattedText(item.Key, ControlsHelper.PrimaryNormalBrush,
-                        flowDirection: FlowDirection.LeftToRight, textSize: 20.001D);
+                    var formattedText = DrawingContextHelper.GetFormattedText(item.Key,
+                        ControlsHelper.PrimaryNormalBrush,
+                        FlowDirection.LeftToRight, 20.001D);
                     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 +136,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;
         }

From b9433b1b2cda666dc67aa676228459b3b1133127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:35 +0800
Subject: [PATCH 084/123] Update ChartRect.cs

---
 src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
index 49f84401..08ec16b4 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
+++ b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
@@ -1,17 +1,17 @@
 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
+    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);
@@ -75,7 +75,8 @@ protected override void OnRender(DrawingContext drawingContext)
                     new Point(StartX - formattedText.Width - 10, yAxis - formattedText.Height / 2));
                 yAxis -= ScaleFactor;
             }
+
             drawingContext.DrawSnappedLinesBetweenPoints(xAxisPen, xAxisPen.Thickness, points.ToArray());
         }
     }
-}
+}
\ No newline at end of file

From 56cfedab5bf026d0a904302bc50f1fec97dece28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:45 +0800
Subject: [PATCH 085/123] Update ControlsHelper.cs

---
 .../Core/Helpers/ControlsHelper.cs                | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
index 601604c4..1748c7c6 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
@@ -85,21 +85,6 @@ public static void ThemeRefresh()
             OnSubThemeChanged();
         }
 
-        public static readonly DependencyProperty CornerRadiusProperty =
-            DependencyProperty.RegisterAttached("CornerRadius", typeof(CornerRadius), typeof(ControlsHelper),
-                new PropertyMetadata(new CornerRadius(4)));
-
-       
-        public static CornerRadius GetCornerRadius(DependencyObject obj)
-        {
-            return (CornerRadius)obj.GetValue(CornerRadiusProperty);
-        }
-
-        public static void SetCornerRadius(DependencyObject obj, CornerRadius value)
-        {
-            obj.SetValue(CornerRadiusProperty, value);
-        }
-
         public static void WindowShake(Window window = null)
         {
             if (window == null)

From 4be92a85ce3b54aa542289dd82b550f3631bab5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:57:59 +0800
Subject: [PATCH 086/123] Create FormatExtensions.cs

---
 .../Core/Utilities/FormatExtensions.cs            | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/WPFDevelopers.Shared/Core/Utilities/FormatExtensions.cs

diff --git a/src/WPFDevelopers.Shared/Core/Utilities/FormatExtensions.cs b/src/WPFDevelopers.Shared/Core/Utilities/FormatExtensions.cs
new file mode 100644
index 00000000..2c10ce10
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Core/Utilities/FormatExtensions.cs
@@ -0,0 +1,15 @@
+using System;
+
+namespace WPFDevelopers.Core
+{
+    public static class FormatExtensions
+    {
+        public static string FormatNumber(this object value)
+        {
+            if (value == null)
+                return string.Empty;
+            return Convert.ToDecimal(value).ToString("#,##0.#########################");
+        }
+    }
+
+}

From 3fd4f701b5dbbe3aa920510143c99659ff7edc22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:58:15 +0800
Subject: [PATCH 087/123] Update Message.cs

---
 src/WPFDevelopers.Shared/Controls/Message/Message.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Message/Message.cs b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
index 2cb96ef1..7852c295 100644
--- a/src/WPFDevelopers.Shared/Controls/Message/Message.cs
+++ b/src/WPFDevelopers.Shared/Controls/Message/Message.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Linq;
 using System.Windows;
 using WPFDevelopers.Helpers;
 

From 50ccb5744cba22f32bd4a9bc0858a83cf49887a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:58:20 +0800
Subject: [PATCH 088/123] Update MessageListBoxItem.cs

---
 src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs b/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs
index 2f1f8ff6..6954e033 100644
--- a/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs
+++ b/src/WPFDevelopers.Shared/Controls/Message/MessageListBoxItem.cs
@@ -22,6 +22,5 @@ public bool IsCenter
         public static readonly DependencyProperty IsCenterProperty =
             DependencyProperty.Register("IsCenter", typeof(bool), typeof(MessageListBoxItem), new PropertyMetadata(false));
 
-
     }
 }

From 6b36af3b5936a24f9f00eccc45ddfa61eeccac15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:58:25 +0800
Subject: [PATCH 089/123] Update MultiSelectComboBox.cs

---
 .../Controls/MultiSelectComboBox/MultiSelectComboBox.cs   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
index bd3d9757..f9894a04 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectComboBox/MultiSelectComboBox.cs
@@ -115,8 +115,8 @@ public override void OnApplyTemplate()
             LanguageManager.Instance.PropertyChanged += Instance_PropertyChanged;
             _popup = GetTemplateChild(PART_Popup) as Popup;
             _multiSelectComboBoxItem = GetTemplateChild(PART_CheckBoxAll) as MultiSelectComboBoxItem;
-            _multiSelectComboBoxItem.Selected += _MultiSelectComboBoxItem_Selected;
-            _multiSelectComboBoxItem.Unselected += _MultiSelectComboBoxItem_Unselected;
+            _multiSelectComboBoxItem.Selected += OnMultiSelectComboBoxItem_Selected;
+            _multiSelectComboBoxItem.Unselected += OnMultiSelectComboBoxItem_Unselected;
         }
 
         private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -124,7 +124,7 @@ private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
             SelectAllContent = LanguageManager.Instance["SelectAll"];
         }
 
-        private void _MultiSelectComboBoxItem_Unselected(object sender, RoutedEventArgs e)
+        private void OnMultiSelectComboBoxItem_Unselected(object sender, RoutedEventArgs e)
         {
             if (_ignoreTextValueChanged) return;
             _ignoreTextValueChanged = true;
@@ -133,7 +133,7 @@ private void _MultiSelectComboBoxItem_Unselected(object sender, RoutedEventArgs
             UpdateText();
         }
 
-        private void _MultiSelectComboBoxItem_Selected(object sender, RoutedEventArgs e)
+        private void OnMultiSelectComboBoxItem_Selected(object sender, RoutedEventArgs e)
         {
             if (_ignoreTextValueChanged) return;
             _ignoreTextValueChanged = true;

From 8b87a4fb7d717cdad0cb235f8a0101ac800a1663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:58:28 +0800
Subject: [PATCH 090/123] Update MultiSelectListBox.cs

---
 .../Controls/MultiSelectionSearchComboBox/MultiSelectListBox.cs  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectListBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectListBox.cs
index 93c0cc62..04fb6691 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectListBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectListBox.cs
@@ -14,6 +14,5 @@ protected override DependencyObject GetContainerForItemOverride()
         {
             return new MultiSelectComboBoxItem();
         }
-
     }
 }

From ac45330815305c785385799fffe2319a40dbcccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 17 Sep 2024 17:58:30 +0800
Subject: [PATCH 091/123] Update MultiSelectSearchComboBox.cs

---
 .../MultiSelectSearchComboBox.cs              | 66 +++++++++----------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
index 120ace6e..6fd5046e 100644
--- a/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MultiSelectionSearchComboBox/MultiSelectSearchComboBox.cs
@@ -198,39 +198,39 @@ public override void OnApplyTemplate()
             _textBox = GetTemplateChild(TextBoxTemplateName) as TextBox;
             _popup = GetTemplateChild(PopupTemplateName) as Popup;
             if (_popup != null)
-                _popup.GotFocus += _popup_GotFocus;
+                _popup.GotFocus += OnPopup_GotFocus;
             _listBox = GetTemplateChild(ListBoxTemplateName) as ListBox;
 
             _checkBox = GetTemplateChild(CheckBoxTemplateName) as CheckBox;
             _listBoxSearch = GetTemplateChild(ListBoxTemplateNameSearch) as ListBox;
             if (_textBox != null)
             {
-                _textBox.TextChanged -= _textbox_TextChanged;
-                _textBox.TextChanged += _textbox_TextChanged;
+                _textBox.TextChanged -= OnTextbox_TextChanged;
+                _textBox.TextChanged += OnTextbox_TextChanged;
             }
 
             if (_checkBox != null)
             {
-                _checkBox.Checked -= _checkBox_Checked;
-                _checkBox.Unchecked -= _checkBox_Unchecked;
-                _checkBox.Checked += _checkBox_Checked;
-                _checkBox.Unchecked += _checkBox_Unchecked;
+                _checkBox.Checked -= OnCheckBox_Checked;
+                _checkBox.Unchecked -= OnCheckBox_Unchecked;
+                _checkBox.Checked += OnCheckBox_Checked;
+                _checkBox.Unchecked += OnCheckBox_Unchecked;
             }
 
             if (_listBox != null)
             {
-                _listBox.IsVisibleChanged -= _listBox_IsVisibleChanged;
-                _listBox.IsVisibleChanged += _listBox_IsVisibleChanged;
-                _listBox.SelectionChanged -= _listBox_SelectionChanged;
-                _listBox.SelectionChanged += _listBox_SelectionChanged;
+                _listBox.IsVisibleChanged -= OnListBox_IsVisibleChanged;
+                _listBox.IsVisibleChanged += OnListBox_IsVisibleChanged;
+                _listBox.SelectionChanged -= OnListBox_SelectionChanged;
+                _listBox.SelectionChanged += OnListBox_SelectionChanged;
             }
 
             if (_listBoxSearch != null)
             {
-                _listBoxSearch.IsVisibleChanged -= _listBoxSearch_IsVisibleChanged;
-                _listBoxSearch.IsVisibleChanged += _listBoxSearch_IsVisibleChanged;
-                _listBoxSearch.SelectionChanged -= _listBoxSearch_SelectionChanged;
-                _listBoxSearch.SelectionChanged += _listBoxSearch_SelectionChanged;
+                _listBoxSearch.IsVisibleChanged -= OnListBoxSearch_IsVisibleChanged;
+                _listBoxSearch.IsVisibleChanged += OnListBoxSearch_IsVisibleChanged;
+                _listBoxSearch.SelectionChanged -= OnListBoxSearch_SelectionChanged;
+                _listBoxSearch.SelectionChanged += OnListBoxSearch_SelectionChanged;
             }
         }
 
@@ -239,13 +239,13 @@ private void Instance_PropertyChanged(object sender, PropertyChangedEventArgs e)
            SelectAllContent = LanguageManager.Instance["SelectAll"];
         }
 
-        private void _listBoxSearch_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        private void OnListBoxSearch_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             if ((bool) e.NewValue)
                 UpdateIsChecked(_listBoxSearch);
         }
 
-        private void _listBox_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+        private void OnListBox_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             if ((bool) e.NewValue)
             {
@@ -258,7 +258,7 @@ private void _listBox_IsVisibleChanged(object sender, DependencyPropertyChangedE
 
         private void UpdateIsChecked(ListBox listBox)
         {
-            _checkBox.Checked -= _checkBox_Checked;
+            _checkBox.Checked -= OnCheckBox_Checked;
             if (listBox.Items.Count > 0 && listBox.Items.Count == listBox.SelectedItems.Count)
             {
                 if (_checkBox.IsChecked != true)
@@ -272,10 +272,10 @@ private void UpdateIsChecked(ListBox listBox)
                     _checkBox.IsChecked = null;
             }
 
-            _checkBox.Checked += _checkBox_Checked;
+            _checkBox.Checked += OnCheckBox_Checked;
         }
 
-        private void _popup_GotFocus(object sender, RoutedEventArgs e)
+        private void OnPopup_GotFocus(object sender, RoutedEventArgs e)
         {
             var source = (HwndSource) PresentationSource.FromVisual(_popup.Child);
             if (source != null)
@@ -285,7 +285,7 @@ private void _popup_GotFocus(object sender, RoutedEventArgs e)
             }
         }
 
-        private void _checkBox_Unchecked(object sender, RoutedEventArgs e)
+        private void OnCheckBox_Unchecked(object sender, RoutedEventArgs e)
         {
             if (_listBoxSearch.Visibility == Visibility.Visible)
                 _listBoxSearch.UnselectAll();
@@ -293,7 +293,7 @@ private void _checkBox_Unchecked(object sender, RoutedEventArgs e)
                 _listBox.UnselectAll();
         }
 
-        private void _checkBox_Checked(object sender, RoutedEventArgs e)
+        private void OnCheckBox_Checked(object sender, RoutedEventArgs e)
         {
             if (_listBoxSearch.Visibility == Visibility.Visible)
                 _listBoxSearch.SelectAll();
@@ -327,7 +327,7 @@ private void Combination()
             Text = string.Join(Delimiter, seletedName.ToArray());
         }
 
-        private void _listBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void OnListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (e.RemovedItems.Count > 0)
             {
@@ -335,12 +335,12 @@ private void _listBox_SelectionChanged(object sender, SelectionChangedEventArgs
                 {
                     if (_checkBox.IsChecked == true)
                     {
-                        _checkBox.Unchecked -= _checkBox_Unchecked;
+                        _checkBox.Unchecked -= OnCheckBox_Unchecked;
                         if (_listBox.Items.Count == 1)
                             _checkBox.IsChecked = false;
                         else
                             _checkBox.IsChecked = null;
-                        _checkBox.Unchecked += _checkBox_Unchecked;
+                        _checkBox.Unchecked += OnCheckBox_Unchecked;
                     }
 
                     if (_listBoxSearch.SelectedItems.Contains(item))
@@ -359,7 +359,7 @@ private void _listBox_SelectionChanged(object sender, SelectionChangedEventArgs
             SelectedItems = _listBox.SelectedItems;
         }
 
-        private void _listBoxSearch_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void OnListBoxSearch_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (!_listBoxSearch.IsVisible)
                 return;
@@ -399,13 +399,13 @@ private void SelectionChecked(ListBox listbox)
                 &&
                 listbox.Items.Count == listbox.SelectedItems.Count)
             {
-                _checkBox.Checked -= _checkBox_Checked;
+                _checkBox.Checked -= OnCheckBox_Checked;
                 _checkBox.IsChecked = true;
-                _checkBox.Checked += _checkBox_Checked;
+                _checkBox.Checked += OnCheckBox_Checked;
             }
             else
             {
-                _checkBox.Checked -= _checkBox_Checked;
+                _checkBox.Checked -= OnCheckBox_Checked;
                 if (listbox.SelectedItems.Count > 0
                     &&
                     listbox.Items.Count == listbox.SelectedItems.Count)
@@ -421,7 +421,7 @@ private void SelectionChecked(ListBox listbox)
                         _checkBox.IsChecked = null;
                 }
 
-                _checkBox.Checked += _checkBox_Checked;
+                _checkBox.Checked += OnCheckBox_Checked;
             }
         }
 
@@ -431,7 +431,7 @@ private string GetDisplayText(object dataItem, string path = null)
             return GetPropertyValue(dataItem);
         }
 
-        private void _textbox_TextChanged(object sender, TextChangedEventArgs e)
+        private void OnTextbox_TextChanged(object sender, TextChangedEventArgs e)
         {
             if (string.IsNullOrWhiteSpace(theLastText)) theLastText = _textBox.Text;
             SearchText(_textBox.Text);
@@ -532,7 +532,7 @@ private static void OnSelectedItemsChanged(DependencyObject d, DependencyPropert
                 var collection = e.NewValue as IList;
                 if (collection.Count <= 0) return;
                 mltiSelectionSearchComboBox._listBox.SelectionChanged -=
-                    mltiSelectionSearchComboBox._listBox_SelectionChanged;
+                    mltiSelectionSearchComboBox.OnListBox_SelectionChanged;
                 foreach (var item in collection)
                 {
                     var name = mltiSelectionSearchComboBox.GetPropertyValue(item);
@@ -548,7 +548,7 @@ private static void OnSelectedItemsChanged(DependencyObject d, DependencyPropert
                 }
 
                 mltiSelectionSearchComboBox._listBox.SelectionChanged +=
-                    mltiSelectionSearchComboBox._listBox_SelectionChanged;
+                    mltiSelectionSearchComboBox.OnListBox_SelectionChanged;
                 mltiSelectionSearchComboBox.Combination();
             }
         }

From 902353be1050e6a2172785a46c300458d2d764da Mon Sep 17 00:00:00 2001
From: DamonChow <icameisawiwon@163.com>
Date: Wed, 18 Sep 2024 12:20:30 +0800
Subject: [PATCH 092/123] fix up some unfindable files issues

---
 src/WPFDevelopers.Net40/Themes/Theme.xaml     | 13204 ++++++++--------
 .../WPFDevelopers.Net40.csproj                |     1 -
 src/WPFDevelopers.Net45x/Themes/Theme.xaml    |   297 +-
 .../WPFDevelopers.Net45x.csproj               |     1 -
 .../Themes/AnimationAudio.xaml                |     2 +-
 src/WPFDevelopers.Shared/Themes/Theme40.txt   |     2 +-
 src/WPFDevelopers.Shared/Themes/Theme45x.txt  |     2 +-
 .../WPFDevelopers.Shared.projitems            |     9 +-
 8 files changed, 6659 insertions(+), 6859 deletions(-)

diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 2e56c421..2d87f9b0 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -1,39 +1,39 @@
-<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">
-	<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>
-	<Color x:Key="WD.PlaceholderTextColor" po:Freeze="True">#C0C4CC</Color>
-	<Color x:Key="WD.NormalColor" po:Freeze="True">#409EFF</Color>
-	<Color x:Key="WD.SuccessBorderBrushColor" po:Freeze="True">#99FA68</Color>
-	<Color x:Key="WD.SuccessBackgroundColor" po:Freeze="True">#EFFCE9</Color>
-	<Color x:Key="WD.SuccessColor" po:Freeze="True">#67C23A</Color>
-	<Color x:Key="WD.SuccessMouseOverColor" po:Freeze="True">#85CE61</Color>
-	<Color x:Key="WD.SuccessPressedColor" po:Freeze="True">#5DAF34</Color>
-	<Color x:Key="WD.WarningBorderBrushColor" po:Freeze="True">#F8DBAF</Color>
-	<Color x:Key="WD.WarningBackgroundColor" po:Freeze="True">#FAF2E5</Color>
-	<Color x:Key="WD.WarningColor" po:Freeze="True">#E6A23C</Color>
-	<Color x:Key="WD.WarningMouseOverColor" po:Freeze="True">#EBB563</Color>
-	<Color x:Key="WD.WarningPressedColor" po:Freeze="True">#CF9236</Color>
-	<Color x:Key="WD.DangerBorderBrushColor" po:Freeze="True">#F88C8C</Color>
-	<Color x:Key="WD.DangerBackgroundColor" po:Freeze="True">#FCE5E5</Color>
-	<Color x:Key="WD.DangerColor" po:Freeze="True">#F56C6C</Color>
-	<Color x:Key="WD.DangerMouseOverColor" po:Freeze="True">#F78989</Color>
-	<Color x:Key="WD.DangerPressedColor" po:Freeze="True">#DD6161</Color>
-	<Color x:Key="WD.InfoColor" po:Freeze="True">#909399</Color>
-	<Color x:Key="WD.InfoMouseOverColor" po:Freeze="True">#A6A9AD</Color>
-	<Color x:Key="WD.InfoPressedColor" po:Freeze="True">#82848A</Color>
-	<Color x:Key="WD.ExtralightColor" po:Freeze="True">#F2F6FC</Color>
-	<Color x:Key="WD.BlackColor" po:Freeze="True">#000000</Color>
-	<Color x:Key="WD.CircularSingularColor" po:Freeze="True">#BAE766</Color>
-	<Color x:Key="WD.CircularDualColor" po:Freeze="True">#B0D440</Color>
-	<RadialGradientBrush x:Key="WD.StarrySkyRadialGradientBrush" po:Freeze="True" Center="0.5,0.3" GradientOrigin="0.5,0" RadiusX="0.7">
-		<GradientStop Offset="0" Color="#FF04040E" />
-		<GradientStop Offset="1" Color="#FF24315D" />
-	</RadialGradientBrush>
-	<sys:Double x:Key="WD.NormalFontSize">13</sys:Double>
-	<sys:Double x:Key="WD.MediumFontSize">14</sys:Double>
-	<sys:Double x:Key="WD.TitleFontSize">16</sys:Double>
-	<FontFamily x:Key="WD.NormalFontFamily">
+<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">
+    <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>
+    <Color x:Key="WD.PlaceholderTextColor" po:Freeze="True">#C0C4CC</Color>
+    <Color x:Key="WD.NormalColor" po:Freeze="True">#409EFF</Color>
+    <Color x:Key="WD.SuccessBorderBrushColor" po:Freeze="True">#99FA68</Color>
+    <Color x:Key="WD.SuccessBackgroundColor" po:Freeze="True">#EFFCE9</Color>
+    <Color x:Key="WD.SuccessColor" po:Freeze="True">#67C23A</Color>
+    <Color x:Key="WD.SuccessMouseOverColor" po:Freeze="True">#85CE61</Color>
+    <Color x:Key="WD.SuccessPressedColor" po:Freeze="True">#5DAF34</Color>
+    <Color x:Key="WD.WarningBorderBrushColor" po:Freeze="True">#F8DBAF</Color>
+    <Color x:Key="WD.WarningBackgroundColor" po:Freeze="True">#FAF2E5</Color>
+    <Color x:Key="WD.WarningColor" po:Freeze="True">#E6A23C</Color>
+    <Color x:Key="WD.WarningMouseOverColor" po:Freeze="True">#EBB563</Color>
+    <Color x:Key="WD.WarningPressedColor" po:Freeze="True">#CF9236</Color>
+    <Color x:Key="WD.DangerBorderBrushColor" po:Freeze="True">#F88C8C</Color>
+    <Color x:Key="WD.DangerBackgroundColor" po:Freeze="True">#FCE5E5</Color>
+    <Color x:Key="WD.DangerColor" po:Freeze="True">#F56C6C</Color>
+    <Color x:Key="WD.DangerMouseOverColor" po:Freeze="True">#F78989</Color>
+    <Color x:Key="WD.DangerPressedColor" po:Freeze="True">#DD6161</Color>
+    <Color x:Key="WD.InfoColor" po:Freeze="True">#909399</Color>
+    <Color x:Key="WD.InfoMouseOverColor" po:Freeze="True">#A6A9AD</Color>
+    <Color x:Key="WD.InfoPressedColor" po:Freeze="True">#82848A</Color>
+    <Color x:Key="WD.ExtralightColor" po:Freeze="True">#F2F6FC</Color>
+    <Color x:Key="WD.BlackColor" po:Freeze="True">#000000</Color>
+    <Color x:Key="WD.CircularSingularColor" po:Freeze="True">#BAE766</Color>
+    <Color x:Key="WD.CircularDualColor" po:Freeze="True">#B0D440</Color>
+    <RadialGradientBrush x:Key="WD.StarrySkyRadialGradientBrush" po:Freeze="True" Center="0.5,0.3" GradientOrigin="0.5,0" RadiusX="0.7">
+        <GradientStop Offset="0" Color="#FF04040E" />
+        <GradientStop Offset="1" Color="#FF24315D" />
+    </RadialGradientBrush>
+    <sys:Double x:Key="WD.NormalFontSize">13</sys:Double>
+    <sys:Double x:Key="WD.MediumFontSize">14</sys:Double>
+    <sys:Double x:Key="WD.TitleFontSize">16</sys:Double>
+    <FontFamily x:Key="WD.NormalFontFamily">
         Helvetica Neue For Number, 
         -apple-system, 
         BlinkMacSystemFont, 
@@ -46,12 +46,12 @@
         Helvetica, Arial, 
         sans-serif
     </FontFamily>
-	<FontStretch x:Key="WD.NormalFontStretch">Normal</FontStretch>
-	<FontStyle x:Key="WD.NormalFontStyle">Normal</FontStyle>
-	<FontWeight x:Key="WD.NormalFontWeight">Normal</FontWeight>
-	<Geometry x:Key="WD.CheckMarkGeometry" po:Freeze="True">M384 690l452-452 60 60-512 512-238-238 60-60z</Geometry>
-	<Geometry x:Key="WD.ChevronDownGeometry" po:Freeze="True">M998 352c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23z</Geometry>
-	<Geometry x:Key="WD.BlackoutGeometry" po:Freeze="True">
+    <FontStretch x:Key="WD.NormalFontStretch">Normal</FontStretch>
+    <FontStyle x:Key="WD.NormalFontStyle">Normal</FontStyle>
+    <FontWeight x:Key="WD.NormalFontWeight">Normal</FontWeight>
+    <Geometry x:Key="WD.CheckMarkGeometry" po:Freeze="True">M384 690l452-452 60 60-512 512-238-238 60-60z</Geometry>
+    <Geometry x:Key="WD.ChevronDownGeometry" po:Freeze="True">M998 352c0 -8 -4 -17 -10 -23l-50 -50c-6 -6 -14 -10 -23 -10c-8 0 -17 4 -23 10l-393 393l-393 -393c-6 -6 -15 -10 -23 -10s-17 4 -23 10l-50 50c-6 6 -10 15 -10 23s4 17 10 23l466 466c6 6 15 10 23 10s17 -4 23 -10l466 -466c6 -6 10 -15 10 -23z</Geometry>
+    <Geometry x:Key="WD.BlackoutGeometry" po:Freeze="True">
         M8.1772461,11.029181 L10.433105,
         11.029181 L11.700684,12.801641 L12.973633,
         11.029181 L15.191895,11.029181 L12.844727,
@@ -60,9 +60,9 @@
         17.060919 L8.1396484,17.060919 L10.519043,
         14.042364 z
     </Geometry>
-	<Geometry x:Key="WD.PreviousGeometry" po:Freeze="True">M658 316l-196 196 196 196-60 60-256-256 256-256z</Geometry>
-	<Geometry x:Key="WD.NextGeometry" po:Freeze="True">M426 256l256 256-256 256-60-60 196-196-196-196z</Geometry>
-	<Geometry x:Key="WD.DatePickerGeometry" po:Freeze="True">
+    <Geometry x:Key="WD.PreviousGeometry" po:Freeze="True">M658 316l-196 196 196 196-60 60-256-256 256-256z</Geometry>
+    <Geometry x:Key="WD.NextGeometry" po:Freeze="True">M426 256l256 256-256 256-60-60 196-196-196-196z</Geometry>
+    <Geometry x:Key="WD.DatePickerGeometry" po:Freeze="True">
         M11.426758,8.4305077 L11.749023,8.4305077
         L11.749023,16.331387 L10.674805,16.331387
         L10.674805,10.299648 L9.0742188,11.298672
@@ -88,6616 +88,6516 @@
         15.399232,12.079271 15.016094,12.491055
         L14.65086,12.238613 z
     </Geometry>
-	<Geometry x:Key="WD.ChevronRightGeometry" po:Freeze="True">M678.4 512l-365.619-379.904c-13.722-13.824-13.722-36.198 0-50.125 13.722-13.824 35.891-13.824 49.613 0l400.896 404.89c13.722 13.875 13.722 36.301 0 50.125l-400.896 404.89c-13.722 13.875-35.891 13.824-49.613 0-13.722-13.773-13.722-36.198 0-50.125l365.619-379.75z</Geometry>
-	<Geometry x:Key="WD.SortArrowGeometry" po:Freeze="True">M854 512l-342 342-342-342 62-60 238 238v-520h84v520l240-238z</Geometry>
-	<Geometry x:Key="WD.WindowMaximizeGeometry" po:Freeze="True">M0.99999994,0.99999994 L0.99999994,9 9,9 9,0.99999994 z M0,0 L10,0 10,10 0,10 z</Geometry>
-	<Geometry x:Key="WD.WindowRestoreGeometry" po:Freeze="True">M1,3 L1,9 7,9 7,3 z M3,0.99999994 L3,2 8,2 8,7 9,7 9,0.99999994 z M2,0 L10,0 10,8 8,8 8,10 0,10 0,2 2,2 z</Geometry>
-	<Geometry x:Key="WD.WindowCloseGeometry" po:Freeze="True">M 1301 69.6875 L 1305.3049 74 L 1300.9375 78.5313 L 1301.6324 79.2263 L 1306 74.735 L 1310.4263 79.2613 L 1311.1563 78.5313 L 1306.7 74 L 1310.9375 69.6875 L 1310.2075 68.9575 L 1306 73.265 L 1301.6949 68.9925 L 1301 69.6875 Z</Geometry>
-	<Geometry x:Key="WD.InformationGeometry" po:Freeze="True">M426 726l384-384-60-62-324 324-152-152-60 60zM512 86c236 0 426 190 426 426s-190 426-426 426-426-190-426-426 190-426 426-426z</Geometry>
-	<Geometry x:Key="WD.WarningGeometry" po:Freeze="True">M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM576 128h-128v448h128v-448zM576 640h-128v128h128v-128z</Geometry>
-	<Geometry x:Key="WD.QuestionGeometry" po:Freeze="True">M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z</Geometry>
-	<Geometry x:Key="WD.ErrorGeometry" po:Freeze="True">M264 456Q210 456 164 429 118 402 91 356 64 310 64 256 64 202 91 156 118 110 164 83 210 56 264 56 318 56 364 83 410 110 437 156 464 202 464 256 464 310 437 356 410 402 364 429 318 456 264 456ZM264 288L328 352 360 320 296 256 360 192 328 160 264 224 200 160 168 192 232 256 168 320 200 352 264 288Z</Geometry>
-	<Geometry x:Key="WD.SmileyOutlineGeometry" po:Freeze="True">M14.36,14.23a3.76,3.76,0,0,1-4.72,0,1,1,0,0,0-1.28,1.54,5.68,5.68,0,0,0,7.28,0,1,1,0,1,0-1.28-1.54ZM9,11a1,1,0,1,0-1-1A1,1,0,0,0,9,11Zm6-2a1,1,0,1,0,1,1A1,1,0,0,0,15,9ZM12,2A10,10,0,1,0,22,12,10,10,0,0,0,12,2Zm0,18a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z</Geometry>
-	<Geometry x:Key="WD.BusGeometry" po:Freeze="True">M18,11H6V6H18M16.5,17A1.5,1.5 0 0,1 15,15.5A1.5,1.5 0 0,1 16.5,14A1.5,1.5 0 0,1 18,15.5A1.5,1.5 0 0,1 16.5,17M7.5,17A1.5,1.5 0 0,1 6,15.5A1.5,1.5 0 0,1 7.5,14A1.5,1.5 0 0,1 9,15.5A1.5,1.5 0 0,1 7.5,17M4,16C4,16.88 4.39,17.67 5,18.22V20A1,1 0 0,0 6,21H7A1,1 0 0,0 8,20V19H16V20A1,1 0 0,0 17,21H18A1,1 0 0,0 19,20V18.22C19.61,17.67 20,16.88 20,16V6C20,2.5 16.42,2 12,2C7.58,2 4,2.5 4,6V16Z</Geometry>
-	<Geometry x:Key="WD.FriendGeometry" po:Freeze="True">M12.3,12.22A4.92,4.92,0,0,0,14,8.5a5,5,0,0,0-10,0,4.92,4.92,0,0,0,1.7,3.72A8,8,0,0,0,1,19.5a1,1,0,0,0,2,0,6,6,0,0,1,12,0,1,1,0,0,0,2,0A8,8,0,0,0,12.3,12.22ZM9,11.5a3,3,0,1,1,3-3A3,3,0,0,1,9,11.5Zm9.74.32A5,5,0,0,0,15,3.5a1,1,0,0,0,0,2,3,3,0,0,1,3,3,3,3,0,0,1-1.5,2.59,1,1,0,0,0-.5.84,1,1,0,0,0,.45.86l.39.26.13.07a7,7,0,0,1,4,6.38,1,1,0,0,0,2,0A9,9,0,0,0,18.74,11.82Z</Geometry>
-	<Geometry x:Key="WD.BuildingRegularGeometry" po:Freeze="True">M128 148v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12zm140 12h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm-128 96h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm128 0h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm-76 84v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm76 12h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm180 124v36H0v-36c0-6.6 5.4-12 12-12h19.5V24c0-13.3 10.7-24 24-24h337c13.3 0 24 10.7 24 24v440H436c6.6 0 12 5.4 12 12zM79.5 463H192v-67c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v67h112.5V49L80 48l-.5 415z</Geometry>
-	<Geometry x:Key="WD.AlarmClockGeometry" po:Freeze="True">M470 124.837l-98.443-81.78-27.814 32.931 98.442 81.769L470 124.837zM167.192 74.919L139.366 42 42 124.837l27.814 32.919 97.378-82.837zm99.509 97.709H234.6v127.446l101.649 60.539L352.3 334.06l-85.6-49.917V172.628zM256 87.665c-107 0-192.601 86.021-192.601 191.166C63.399 383.98 149 470 256 470c105.936 0 192.601-86.02 192.601-191.169 0-105.144-86.665-191.166-192.601-191.166zm0 339.855c-82.393 0-149.8-66.906-149.8-148.688 0-81.777 67.407-148.684 149.8-148.684 82.394 0 149.8 66.906 149.8 148.684 0 82.839-67.406 148.688-149.8 148.688z</Geometry>
-	<Geometry x:Key="WD.FlagGeometry" po:Freeze="True">M687.5 125C500 125 375 13.7 187.5 62.5V31.3C187.5 31.3 187.5 0 156.3 0C125 0 125 31.3 125 31.3V1000H187.5V625C375 562.5 500 687.5 687.5 687.5C875 687.5 937.5 625 937.5 625V62.5C937.5 62.5 875 125 687.5 125Z</Geometry>
-	<Geometry x:Key="WD.CircularGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
-	<Geometry x:Key="WD.AddGeometry" po:Freeze="True">M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z</Geometry>
-	<Geometry x:Key="WD.ChatLeftGeometry" po:Freeze="True">M365.714 256v512q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857l-256-256q-10.857-10.857-10.857-25.714t10.857-25.714l256-256q10.857-10.857 25.714-10.857t25.714 10.857 10.857 25.714z</Geometry>
-	<Geometry x:Key="WD.ChatRightGeometry" po:Freeze="True">M329.143 512q0 14.857-10.857 25.714l-256 256q-10.857 10.857-25.714 10.857t-25.714-10.857-10.857-25.714v-512q0-14.857 10.857-25.714t25.714-10.857 25.714 10.857l256 256q10.857 10.857 10.857 25.714z</Geometry>
-	<Geometry x:Key="WD.StarGeometry" po:Freeze="True">M649.714 573.714l174.857-169.714-241.143-35.429-108-218.286-108 218.286-241.143 35.429 174.857 169.714-41.714 240.571 216-113.714 215.429 113.714zM950.857 369.714q0 12.571-14.857 27.429l-207.429 202.286 49.143 285.714q0.571 4 0.571 11.429 0 28.571-23.429 28.571-10.857 0-22.857-6.857l-256.571-134.857-256.571 134.857q-12.571 6.857-22.857 6.857-12 0-18-8.286t-6-20.286q0-3.429 1.143-11.429l49.143-285.714-208-202.286q-14.286-15.429-14.286-27.429 0-21.143 32-26.286l286.857-41.714 128.571-260q10.857-23.429 28-23.429t28 23.429l128.571 260 286.857 41.714q32 5.143 32 26.286z</Geometry>
-	<Geometry x:Key="WD.CompleteGeometry" po:Freeze="True">M384 690l452-452 60 60-512 512-238-238 60-60z</Geometry>
-	<Geometry x:Key="WD.CancelGeometry" po:Freeze="True">M810.667 170.667q18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-268.667 268.333 268.667 268.333q12.333 12.333 12.333 30.333 0 18.333-12.167 30.5t-30.5 12.167q-18 0-30.333-12.333l-268.333-268.667-268.333 268.667q-12.333 12.333-30.333 12.333-18.333 0-30.5-12.167t-12.167-30.5q0-18 12.333-30.333l268.667-268.333-268.667-268.333q-12.333-12.333-12.333-30.333 0-18.333 12.167-30.5t30.5-12.167q18 0 30.333 12.333l268.333 268.667 268.333-268.667q12.333-12.333 30.333-12.333z</Geometry>
-	<Geometry x:Key="WD.SaveGeometry" po:Freeze="True">M512 42.667q17.667 0 30.167 12.5t12.5 30.167v494.333l140.333-140.667q12.333-12.333 30.333-12.333 18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-213.333 213.333q-12.333 12.333-30.333 12.333t-30.333-12.333l-213.333-213.333q-12.333-13-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5q18 0 30.333 12.333l140.333 140.667v-494.333q0-17.667 12.5-30.167t30.167-12.5zM938.667 640q17.667 0 30.167 12.5t12.5 30.167v170.667q0 53.333-37 90.333-37.667 37.667-90 37.667h-683.667q-52.333 0-90.667-37.333-37.333-38.333-37.333-90.667v-170.667q0-17.667 12.5-30.167t30.167-12.5 30.167 12.5 12.5 30.167v170.667q0 17.667 12.5 30.167t30.167 12.5h683.667q17.333 0 29.5-12.5t12.167-30.167v-170.667q0-17.667 12.5-30.167t30.167-12.5z</Geometry>
-	<Geometry x:Key="WD.MenuGeometry" po:Freeze="True">M2,15.5L22,15.5 22,17.5 2,17.5 2,15.5z M2,10.5L22,10.5 22,12.5 2,12.5 2,10.5z M2,5.5L22,5.5 22,7.5 2,7.5 2,5.5z</Geometry>
-	<Geometry x:Key="WD.SectorGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
-	<Geometry x:Key="WD.ReplaceGeometry" po:Freeze="True">M282.419 728.269c-115.814-124.518-113.766-319.693 6.554-440.883 49.254-49.613 110.797-79.206 174.797-88.883l-3.533-106.342c-89.856 10.906-176.742 50.995-245.606 120.371-161.229 162.304-163.174 424.397-6.298 590.387l-89.139 89.702 282.112 15.411-0.768-298.701-118.118 118.938zM622.746 115.968l0.768 298.701 118.118-118.886c115.814 124.621 113.766 319.795-6.554 440.883-49.203 49.613-110.797 79.206-174.797 88.883l3.533 106.291c89.856-10.906 176.742-50.995 245.658-120.32 161.178-162.406 163.123-424.499 6.246-590.387l89.139-89.805-282.112-15.36z</Geometry>
-	<Geometry x:Key="WD.AudioOneGeometry" po:Freeze="True">M344.96 362.647l-146.526 150.83L347.89 664.314c79.122-82.808 79.122-218.856-2.93-301.667z</Geometry>
-	<Geometry x:Key="WD.AudioTwoGeometry" po:Freeze="True">M494.413 214.765l-73.263 73.941c123.083 124.215 123.083 325.328 0 449.546l73.263 73.938c164.11-165.625 164.11-431.797 0-597.425z</Geometry>
-	<Geometry x:Key="WD.AudioThreeGeometry" po:Freeze="True">M640.944 63.934l-73.266 73.941c205.138 207.023 205.138 541.221 0 748.256l73.266 73.935c246.163-245.478 246.163-647.699 0-896.132z</Geometry>
-	<Geometry x:Key="WD.RectangleGeometry" po:Freeze="True">M640 146.286h-475.429q-37.714 0-64.571 26.857t-26.857 64.571v475.429q0 37.714 26.857 64.571t64.571 26.857h475.429q37.714 0 64.571-26.857t26.857-64.571v-475.429q0-37.714-26.857-64.571t-64.571-26.857zM804.571 237.714v475.429q0 68-48.286 116.286t-116.286 48.286h-475.429q-68 0-116.286-48.286t-48.286-116.286v-475.429q0-68 48.286-116.286t116.286-48.286h475.429q68 0 116.286 48.286t48.286 116.286z</Geometry>
-	<Geometry x:Key="WD.EllipseGeometry" po:Freeze="True">M438.857 201.143q-84.571 0-156 41.714t-113.143 113.143-41.714 156 41.714 156 113.143 113.143 156 41.714 156-41.714 113.143-113.143 41.714-156-41.714-156-113.143-113.143-156-41.714zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z</Geometry>
-	<Geometry x:Key="WD.UpperTriangleGeometry" po:Freeze="True">M768 716.8h-512l256-460.8 256 460.8z</Geometry>
-	<Geometry x:Key="WD.ArrowGeometry" po:Freeze="True">M2.8421711E-14,30 L30,15 2.8421711E-14,3.5527137E-15 5.3751788,15 z</Geometry>
-	<Geometry x:Key="WD.ArrowRightTopGeometry" po:Freeze="True">M384 214h426v426h-84v-282l-496 496-60-60 496-496h-282v-84z</Geometry>
-	<Geometry x:Key="WD.ArrowBranchesGeometry" po:Freeze="True">M458.361,207.01328 L574.12778,224.42874 574,184 458.361,204.52536</Geometry>
-	<Geometry x:Key="WD.TextGeometry" po:Freeze="True">M8.394,7.3850001 L18,7.3850001 18,8.9495381 14.071471,8.9495381 14.071471,21 12.304952,21 12.304952,8.9495381 8.394,8.9495381 z M5.2364039,2.4000326 C4.4364113,2.4000326 3.7515685,2.6937805 3.1818757,3.2812766 2.612183,3.8687721 2.3273365,4.5750159 2.3273365,5.4000081 L2.3273365,20.999992 C2.3273365,21.824983 2.612183,22.531227 3.1818757,23.118723 3.7515685,23.706219 4.4364113,23.999966 5.2364039,23.999966 L20.363661,23.999966 C21.163652,23.999966 21.848495,23.706219 22.418188,23.118723 22.987883,22.531227 23.272728,21.824983 23.272728,20.999992 L23.272728,5.4000081 C23.272728,4.5750159 22.987883,3.8687721 22.418188,3.2812766 21.848495,2.6937805 21.163652,2.4000326 20.363661,2.4000326 z M5.2363719,0 L20.36363,0 C21.806051,0 23.039387,0.52812719 24.063631,1.5843812 25.087877,2.6406356 25.6,3.912511 25.6,5.4000081 L25.6,20.999992 C25.6,22.487488 25.087877,23.759365 24.063631,24.815618 23.039387,25.871874 21.806051,26.399999 20.36363,26.399999 L5.2363719,26.399999 C3.7939503,26.399999 2.5606164,25.871874 1.5363699,24.815618 0.51212323,23.759365 -5.3697355E-08,22.487488 3.5527137E-15,20.999992 L3.5527137E-15,5.4000081 C-5.3697355E-08,3.912511 0.51212323,2.6406356 1.5363699,1.5843812 2.5606164,0.52812719 3.7939503,0 5.2363719,0 z</Geometry>
-	<Geometry x:Key="WD.InkGeometry" po:Freeze="True">M986.466 37.502c-49.982-49.982-131.004-49.982-180.986 0l-483.984 484.144c43.262 11.264 83.262 32.99 115.74 65.502 32.99 32.99 54.014 73.246 65.246 115.484l483.984-484.144c50.014-49.982 50.014-131.002 0-180.986zM346.742 858.63c49.982-49.982 49.982-131.004 0-180.986s-131.004-49.982-180.986 0l-165.756 346.356 346.742-165.37z</Geometry>
-	<Geometry x:Key="WD.StarSkyGeometry" po:Freeze="True">M16.001007,0L20.944,10.533997 32,12.223022 23.998993,20.421997 25.889008,32 16.001007,26.533997 6.1109924,32 8,20.421997 0,12.223022 11.057007,10.533997z</Geometry>
-	<Geometry x:Key="WD.ReturnGeometry" po:Freeze="True">M356.667 155q17.333 0 30 12.5t12.667 30.167-12.667 30.333l-198.667 198.667h409.333q78 0 149.167 30.333t122.5 81.833 81.833 122.5 30.5 149.333v42.667q0 17.667-12.5 30.167t-30.167 12.5q-17.333 0-30-12.667t-12.667-30v-42.667q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667h-409.333l198.667 199q12.667 12.667 12.667 30 0 17.667-12.5 30.333t-30.167 12.667-30.333-12.667l-271.333-271.667q-12.333-12.333-12.333-30.333 0-17.667 12.333-30l271.333-271.667q12.667-12.667 30.333-12.667z</Geometry>
-	<Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
-	<Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
-	<Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
-	<Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
-	<CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
-	<PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
-	<ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
-	<SineEase x:Key="WD.SineEaseOut" EasingMode="EaseOut" />
-	<SineEase x:Key="WD.SineEaseInOut" EasingMode="EaseInOut" />
-	<BackEase x:Key="WD.BackEaseEaseInOut" EasingMode="EaseInOut" />
-	<sys:Double x:Key="WD.EnabledOpacity">0.7</sys:Double>
-	<sys:Double x:Key="WD.DefaultCornerRadius">4</sys:Double>
-	<sys:Double x:Key="WD.DefaultHeight">32</sys:Double>
-	<sys:Double x:Key="WD.ThumbWidth">16</sys:Double>
-	<sys:Double x:Key="WD.ThumbCornerRadius">8</sys:Double>
-	<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" />
-		<Style.Triggers>
-			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="{x:Null}">
-				<Setter Property="Visibility" Value="Collapsed" />
-			</DataTrigger>
-			<DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="">
-				<Setter Property="Visibility" Value="Collapsed" />
-			</DataTrigger>
-		</Style.Triggers>
-	</Style>
-	<converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
-	<converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
-	<converts: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" />
-	<ec:IsArrangedToScaleConverter x:Key="IsArrangedToScaleConverter" />
-	<ControlTemplate x:Key="ValidationToolTipTemplate">
-		<Grid Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
-			<UIElement.RenderTransform>
-				<TranslateTransform x:Name="xform" X="-25" />
-			</UIElement.RenderTransform>
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="OpenStates">
-					<VisualStateGroup.Transitions>
-						<VisualTransition GeneratedDuration="0" />
-						<VisualTransition GeneratedDuration="0:0:0.2" To="Open">
-							<Storyboard>
-								<DoubleAnimation Duration="0:0:0.2" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform">
-									<DoubleAnimation.EasingFunction>
-										<BackEase Amplitude=".3" EasingMode="EaseOut" />
-									</DoubleAnimation.EasingFunction>
-								</DoubleAnimation>
-								<DoubleAnimation Duration="0:0:0.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-							</Storyboard>
-						</VisualTransition>
-					</VisualStateGroup.Transitions>
-					<VisualState x:Name="Closed">
-						<Storyboard>
-							<DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="Open">
-						<Storyboard>
-							<DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform" />
-							<DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
-						</Storyboard>
-					</VisualState>
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-			<Border Background="#052A2E31" CornerRadius="5" Margin="4,4,-4,-4" />
-			<Border Background="#152A2E31" CornerRadius="4" Margin="3,3,-3,-3" />
-			<Border Background="#252A2E31" CornerRadius="3" Margin="2,2,-2,-2" />
-			<Border Background="#352A2E31" CornerRadius="2" Margin="1,1,-1,-1" />
-			<Border Background="#FFDC000C" CornerRadius="2" />
-			<Border CornerRadius="2">
-				<TextBlock Foreground="#FFFFFFFF" MaxWidth="250" Margin="8,4,8,4" TextWrapping="Wrap" UseLayoutRounding="False" Text="{Binding (Validation.Errors)[0].ErrorContent}" />
-			</Border>
-		</Grid>
-	</ControlTemplate>
-	<Style TargetType="{x:Type ec:PathListBoxItem}" x:Key="{x:Type ec:PathListBoxItem}">
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="Background" Value="#00FFFFFF" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ec:PathListBoxItem}">
-					<Grid Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5">
-						<UIElement.RenderTransform>
-							<TransformGroup>
-								<ScaleTransform ScaleX="{Binding IsArranged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsArrangedToScaleConverter}}" ScaleY="{Binding IsArranged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsArrangedToScaleConverter}}" />
-								<SkewTransform />
-								<RotateTransform Angle="{Binding OrientationAngle, RelativeSource={RelativeSource TemplatedParent}}" />
-								<TranslateTransform />
-							</TransformGroup>
-						</UIElement.RenderTransform>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="MouseOver">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="fillColor" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To=".55" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="contentPresenter" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Duration="0" To=".75" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="fillColor2" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="FocusStates">
-								<VisualState x:Name="Focused">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FocusVisualElement">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<ObjectKeyFrame.Value>
-													<Visibility>Visible</Visibility>
-												</ObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unfocused" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Rectangle Name="fillColor" Fill="#FFBADDE9" IsHitTestVisible="False" Opacity="0" RadiusY="1" RadiusX="1" />
-						<Rectangle Name="fillColor2" Fill="#FFBADDE9" IsHitTestVisible="False" Opacity="0" RadiusY="1" RadiusX="1" />
-						<ContentPresenter Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" />
-						<Rectangle Name="FocusVisualElement" RadiusY="1" RadiusX="1" Stroke="#FF6DBDD1" StrokeThickness="1" Visibility="Collapsed" />
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="{x:Type drawingControls:Callout}" x:Key="{x:Type drawingControls:Callout}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type drawingControls:Callout}">
-					<Grid>
-						<Path Name="PART_Path" Fill="{TemplateBinding Fill}" Stroke="{TemplateBinding Stroke}" StrokeThickness="{TemplateBinding StrokeThickness}" StrokeDashArray="{TemplateBinding StrokeDashArray}" StrokeDashCap="{TemplateBinding StrokeDashCap}" StrokeDashOffset="{TemplateBinding StrokeDashOffset}" StrokeLineJoin="{TemplateBinding StrokeLineJoin}" StrokeMiterLimit="{TemplateBinding StrokeMiterLimit}" StrokeStartLineCap="{TemplateBinding StrokeStartLineCap}" StrokeEndLineCap="{TemplateBinding StrokeEndLineCap}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="Fill" UseLayoutRounding="False" />
-						<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding InternalContent}" Margin="{TemplateBinding Padding}" />
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style TargetType="{x:Type drawingControls:LineArrow}" x:Key="{x:Type drawingControls:LineArrow}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type drawingControls:LineArrow}">
-					<Path Name="PART_Path" Fill="{TemplateBinding Stroke}" Stroke="{TemplateBinding Stroke}" StrokeThickness="{TemplateBinding StrokeThickness}" StrokeDashArray="{TemplateBinding StrokeDashArray}" StrokeDashCap="{TemplateBinding StrokeDashCap}" StrokeDashOffset="{TemplateBinding StrokeDashOffset}" StrokeLineJoin="{TemplateBinding StrokeLineJoin}" StrokeMiterLimit="{TemplateBinding StrokeMiterLimit}" StrokeStartLineCap="{TemplateBinding StrokeStartLineCap}" StrokeEndLineCap="{TemplateBinding StrokeEndLineCap}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="Fill" UseLayoutRounding="False" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="WD.LampEffectStreamer" TargetType="{x:Type controls:BreathLamp}">
-		<controls:SmallPanel>
-			<Viewbox>
-				<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-					<Border x:Name="PART_LampContainer" Background="Transparent" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
-						<Border.BorderBrush>
-							<LinearGradientBrush>
-								<LinearGradientBrush.GradientStops>
-									<GradientStop Offset="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=GradientStopColor1}" />
-									<GradientStop Offset="0.3" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=GradientStopColor2}" />
-									<GradientStop Offset="1" Color="Transparent" />
-								</LinearGradientBrush.GradientStops>
-							</LinearGradientBrush>
-						</Border.BorderBrush>
-					</Border>
-				</controls:SmallPanel>
-			</Viewbox>
-			<Border Padding="{TemplateBinding BorderThickness}">
-				<ContentPresenter Margin="{TemplateBinding BorderThickness}" />
-			</Border>
-		</controls:SmallPanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsLampStart" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard x:Name="PART_LampStoryboard">
-						<Storyboard RepeatBehavior="Forever">
-							<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_LampContainer" Storyboard.TargetProperty="(Border.BorderBrush).(LinearGradientBrush.StartPoint)">
-								<EasingPointKeyFrame KeyTime="0:0:0.0" Value="0,1" />
-								<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
-								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
-								<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
-								<EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
-								<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
-							</PointAnimationUsingKeyFrames>
-							<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_LampContainer" Storyboard.TargetProperty="(Border.BorderBrush).(LinearGradientBrush.EndPoint)">
-								<EasingPointKeyFrame KeyTime="0:0:0.0" Value="0,1" />
-								<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
-								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
-								<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
-								<EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
-								<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
-							</PointAnimationUsingKeyFrames>
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<StopStoryboard BeginStoryboardName="PART_LampStoryboard" />
-				</Trigger.ExitActions>
-			</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" />
-	<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" />
-	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
-		<GradientStop Color="#FF0000" />
-		<GradientStop Offset="0.167" Color="#FF00FF" />
-		<GradientStop Offset="0.334" Color="#0000FF" />
-		<GradientStop Offset="0.501" Color="#00FFFF" />
-		<GradientStop Offset="0.668" Color="#00FF00" />
-		<GradientStop Offset="0.835" Color="#FFFF00" />
-		<GradientStop Offset="1" Color="#FF0000" />
-	</LinearGradientBrush>
-	<ControlTemplate x:Key="WD.ColorPickerSliderThumbTemplate" TargetType="Thumb">
-		<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="Transparent" BorderBrush="White" BorderThickness="3" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
-	</ControlTemplate>
-	<Style x:Key="WD.ColorPickerSliderRepeatButtonBaseStyle" TargetType="RepeatButton">
-		<Setter Property="OverridesDefaultStyle" Value="true" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Focusable" Value="false" />
-		<Setter Property="IsTabStop" Value="false" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="RepeatButton">
-					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
-	<SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
-	<SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
-	<SolidColorBrush x:Key="WD.SuccessBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessBorderBrushColor}" />
-	<SolidColorBrush x:Key="WD.SuccessBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessBackgroundColor}" />
-	<SolidColorBrush x:Key="WD.SuccessSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessColor}" />
-	<SolidColorBrush x:Key="WD.SuccessMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessMouseOverColor}" />
-	<SolidColorBrush x:Key="WD.SuccessPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessPressedColor}" />
-	<SolidColorBrush x:Key="WD.WarningBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningBorderBrushColor}" />
-	<SolidColorBrush x:Key="WD.WarningBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningBackgroundColor}" />
-	<SolidColorBrush x:Key="WD.WarningSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningColor}" />
-	<SolidColorBrush x:Key="WD.WarningMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningMouseOverColor}" />
-	<SolidColorBrush x:Key="WD.WarningPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningPressedColor}" />
-	<SolidColorBrush x:Key="WD.DangerBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerBorderBrushColor}" />
-	<SolidColorBrush x:Key="WD.DangerBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerBackgroundColor}" />
-	<SolidColorBrush x:Key="WD.DangerSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerColor}" />
-	<SolidColorBrush x:Key="WD.DangerMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerMouseOverColor}" />
-	<SolidColorBrush x:Key="WD.DangerPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerPressedColor}" />
-	<SolidColorBrush x:Key="WD.InfoSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoColor}" />
-	<SolidColorBrush x:Key="WD.InfoMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoMouseOverColor}" />
-	<SolidColorBrush x:Key="WD.InfoPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoPressedColor}" />
-	<SolidColorBrush x:Key="WD.ExtralightSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.ExtralightColor}" />
-	<SolidColorBrush x:Key="WD.BlackSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.BlackColor}" />
-	<SolidColorBrush x:Key="WD.CircularSingularSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.CircularSingularColor}" />
-	<SolidColorBrush x:Key="WD.CircularDualSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.CircularDualColor}" />
-	<Style x:Key="WD.ControlBasicStyle" TargetType="Control">
-		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
-		<Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-		<Setter Property="TextElement.FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="TextElement.FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="TextElement.FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="TextElement.FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
-		<Setter Property="TextElement.FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-		<Setter Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="TextBlock.FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="TextBlock.FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="TextBlock.FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="TextBlock.FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
-		<Setter Property="TextBlock.FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-		<Setter Property="TextBlock.Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
-		<Style.Triggers>
-			<Trigger Property="IsEnabled" Value="False">
-				<Setter Property="Opacity" Value="{StaticResource WD.EnabledOpacity}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<DropShadowEffect x:Key="WD.NormalShadowDepth" BlurRadius="5" Direction="270" Opacity=".42" RenderingBias="Performance" ShadowDepth="1" Color="{StaticResource WD.ShadowDepthColor}" />
-	<DropShadowEffect x:Key="WD.PopupShadowDepth" BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{StaticResource WD.BlackColor}" />
-	<Style x:Key="WD.BaseButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ButtonBase}">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<!--<Setter Property="helpers:ElementHelper.CornerRadius" Value="3" />-->
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-	</Style>
-	<Style x:Key="WD.NormalButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<controls:SmallPanel>
-						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Opacity=".4" SnapsToDevicePixels="True" />
-						<ContentPresenter Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="UIElement.IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.ButtonFocusVisualColor}" />
-						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
-							<Setter TargetName="PART_Border" Property="Width">
-								<Setter.Value>
-									<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
-										<Binding ElementName="PART_Border" Path="ActualWidth" />
-										<Binding ElementName="PART_Border" Path="ActualHeight" />
-									</MultiBinding>
-								</Setter.Value>
-							</Setter>
-							<Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.PrimaryButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<controls:SmallPanel>
-						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
-							<Setter TargetName="PART_Border" Property="Width">
-								<Setter.Value>
-									<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
-										<Binding ElementName="PART_Border" Path="ActualWidth" />
-										<Binding ElementName="PART_Border" Path="ActualHeight" />
-									</MultiBinding>
-								</Setter.Value>
-							</Setter>
-							<Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<controls:SmallPanel>
-						<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" TextElement.Foreground="{TemplateBinding Foreground}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsFocused" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBackgroundPressedSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.DefaultBackgroundPressedSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsRound" Value="True">
-							<Setter Property="Padding" Value="0" />
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
-							<Setter TargetName="PART_Border" Property="Width">
-								<Setter.Value>
-									<MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
-										<Binding ElementName="PART_Border" Path="ActualWidth" />
-										<Binding ElementName="PART_Border" Path="ActualHeight" />
-									</MultiBinding>
-								</Setter.Value>
-							</Setter>
-							<Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.SuccessPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessMouseOverSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.SuccessDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.WarningPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.WarningSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.WarningMouseOverSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.WarningDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.WarningBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.WarningSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.WarningBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.WarningSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.DangerPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.DangerSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.DangerMouseOverSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.DangerDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Style.Triggers>
-			<Trigger Property="IsFocused" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.DangerBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.DangerSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsPressed" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.DangerBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.DangerSolidColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.PathButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<Border Background="Transparent">
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".8" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.WindowButtonStyle" TargetType="{x:Type Button}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="Padding" Value="3" />
-		<Setter Property="Margin" Value="0" />
-		<Setter Property="MinWidth" Value="30" />
-		<Setter Property="MinHeight" Value="28" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<controls:SmallPanel Background="Transparent">
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Opacity="0.7" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="MouseOver">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="1" Duration="0" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Pressed">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="1" Duration="0" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Disabled">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="0.3" Duration="0" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="FocusStates">
-								<VisualState x:Name="Focused" />
-								<VisualState x:Name="Unfocused" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
-	<Style BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-		<Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
-		<Setter Property="WindowStyle" Value="None" />
-		<Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" />
-		<Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
-		<Setter Property="shell:WindowChrome.WindowChrome">
-			<Setter.Value>
-				<shell:WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type wd:Window}">
-					<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<Grid x:Name="LayoutRoot">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="*" />
-							</Grid.RowDefinitions>
-							<controls:SmallPanel Grid.Row="0" Background="{TemplateBinding TitleBackground}">
-								<Grid x:Name="PART_GridChrome" Height="{TemplateBinding TitleHeight}">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="*" />
-										<ColumnDefinition Width="Auto" MinWidth="30" />
-									</Grid.ColumnDefinitions>
-									<Image Width="30" Height="30" Margin="14,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" Source="{TemplateBinding Icon}" Stretch="Fill" Visibility="{TemplateBinding Icon,&#xD;&#xA;                                                                     Converter={StaticResource ObjectNullToVisibilityConverter}}" />
-									<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}}">
-												<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}}">
-												<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">
-												<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}}">
-											<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
-										</Button>
-									</WrapPanel>
-								</Grid>
-								<ContentPresenter x:Name="PART_TitleToolBar" shell:WindowChrome.IsHitTestVisibleInChrome="True" Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" Focusable="False" Visibility="Collapsed" />
-							</controls:SmallPanel>
-							<AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
-								<ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
-							</AdornerDecorator>
-							<ResizeGrip x:Name="ResizeGrip" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsTabStop="False" Visibility="Collapsed" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="WindowState" Value="Maximized">
-							<Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
-							<Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_Border" Property="Margin" Value="7" />
-						</Trigger>
-						<Trigger Property="WindowStyle" Value="ToolWindow">
-							<Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="NoChrome" Value="True">
-							<Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="ResizeMode" Value="CanResizeWithGrip" />
-								<Condition Property="WindowState" Value="Normal" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Menu}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Menu}">
-					<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-						<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.SeparatorStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Separator}">
-		<Setter Property="Height" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Margin" Value="0,2" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Separator}">
-					<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="WD.TopLevelHeaderTemplateKey" TargetType="{x:Type MenuItem}">
-		<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" SnapsToDevicePixels="True">
-			<controls:SmallPanel Background="Transparent">
-				<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
-				<Popup x:Name="Popup" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsSubmenuOpen}" Placement="Bottom" PlacementTarget="{Binding ElementName=Border}">
-					<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" />
-							</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" />
-					</Grid>
-				</Popup>
-			</controls:SmallPanel>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsSuspendingPopupAnimation" Value="True">
-				<Setter TargetName="Popup" Property="PopupAnimation" Value="None" />
-			</Trigger>
-			<Trigger Property="IsHighlighted" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsSubmenuOpen" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.TopLevelItemTemplateKey" TargetType="{x:Type MenuItem}">
-		<Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-			<controls:SmallPanel Background="Transparent">
-				<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
-			</controls:SmallPanel>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsHighlighted" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.SubmenuItemTemplateKey" TargetType="{x:Type MenuItem}">
-		<Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-			<Grid Background="Transparent">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" MinWidth="24" SharedSizeGroup="Icon" />
-					<ColumnDefinition Width="4" />
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="30" />
-					<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
-					<ColumnDefinition Width="20" />
-				</Grid.ColumnDefinitions>
-				<ContentPresenter x:Name="Icon" Margin="1" VerticalAlignment="Center" ContentSource="Icon" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-				<Path x:Name="CheckMark" Width="12" Height="10" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" Visibility="Hidden" />
-				<ContentPresenter x:Name="HeaderHost" Grid.Column="2" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
-				<TextBlock x:Name="InputGestureText" Grid.Column="4" Margin="5,2,0,2" DockPanel.Dock="Right" Text="{TemplateBinding InputGestureText}" />
-			</Grid>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="ButtonBase.Command" Value="{x:Null}" />
-			<Trigger Property="Icon" Value="{x:Null}">
-				<Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
-				<Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="IsHighlighted" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.SubmenuHeaderTemplateKey" TargetType="{x:Type MenuItem}">
-		<Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
-			<Grid>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" MinWidth="24" SharedSizeGroup="Icon" />
-					<ColumnDefinition Width="4" />
-					<ColumnDefinition Width="*" />
-					<ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
-					<ColumnDefinition Width="20" />
-				</Grid.ColumnDefinitions>
-				<ContentPresenter x:Name="Icon" Margin="3,0,0,0" VerticalAlignment="Center" ContentSource="Icon" />
-				<Path x:Name="CheckMark" Width="12" Height="10" Margin="3,0,0,0" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" Visibility="Hidden" />
-				<ContentPresenter x:Name="HeaderHost" Grid.Column="2" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
-				<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">
-						<ScrollViewer Margin="0,4" CanContentScroll="True">
-							<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
-						</ScrollViewer>
-					</Border>
-				</Popup>
-			</Grid>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="Icon" Value="{x:Null}">
-				<Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
-				<Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
-			</Trigger>
-			<Trigger Property="IsHighlighted" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="WD.DefaultMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type MenuItem}">
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Style.Triggers>
-			<Trigger Property="Role" Value="TopLevelHeader">
-				<Setter Property="MinWidth" Value="44" />
-				<Setter Property="Template" Value="{StaticResource WD.TopLevelHeaderTemplateKey}" />
-				<Setter Property="Grid.IsSharedSizeScope" Value="True" />
-			</Trigger>
-			<Trigger Property="Role" Value="TopLevelItem">
-				<Setter Property="Template" Value="{StaticResource WD.TopLevelItemTemplateKey}" />
-			</Trigger>
-			<Trigger Property="Role" Value="SubmenuHeader">
-				<Setter Property="MinWidth" Value="240" />
-				<Setter Property="Template" Value="{StaticResource WD.SubmenuHeaderTemplateKey}" />
-			</Trigger>
-			<Trigger Property="Role" Value="SubmenuItem">
-				<Setter Property="MinWidth" Value="240" />
-				<Setter Property="Template" Value="{StaticResource WD.SubmenuItemTemplateKey}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.SeparatorStyleKey}" TargetType="{x:Type Separator}" />
-	<Style BasedOn="{StaticResource WD.DefaultMenuItem}" TargetType="{x:Type MenuItem}" />
-	<Style BasedOn="{StaticResource WD.DefaultMenu}" TargetType="{x:Type Menu}" />
-	<Style x:Key="WD.DefaultContextMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ContextMenu}">
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Margin" Value="10" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ContextMenu">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}">
-						<ScrollViewer Padding="0,6">
-							<ItemsPresenter />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
-	<Style x:Key="WD.DefaultRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="4,0" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RadioButton}">
-					<BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
-						<BulletDecorator.Bullet>
-							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-								<controls:SmallPanel MinWidth="16" MinHeight="16">
-									<Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
-									<Ellipse x:Name="PART_Ellipse" MinWidth="6" MinHeight="6" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5">
-										<Ellipse.RenderTransform>
-											<ScaleTransform ScaleX="0" ScaleY="0" />
-										</Ellipse.RenderTransform>
-									</Ellipse>
-								</controls:SmallPanel>
-							</Border>
-						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CheckStates">
-								<VisualState x:Name="Unchecked" />
-								<VisualState x:Name="Indeterminate" />
-								<VisualState x:Name="Checked">
-									<Storyboard>
-										<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(ScaleTransform.ScaleX)" To=".4" Duration="00:00:.3" />
-										<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(ScaleTransform.ScaleY)" To=".4" Duration="00:00:.3" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</BulletDecorator>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PART_Border" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter TargetName="PART_Border" Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Border" Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.PathRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RadioButton}">
-					<Border Background="Transparent">
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".8" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ColorRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="8" />
-		<Setter Property="Width" Value="15" />
-		<Setter Property="Height" Value="15" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RadioButton}">
-					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="7">
-						<Ellipse x:Name="PART_Ellipse" Width="7" Height="7" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" Visibility="Collapsed" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CheckStates">
-								<VisualState x:Name="Checked">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(UIElement.Visibility)">
-											<DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unchecked" />
-								<VisualState x:Name="Indeterminate" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Opacity" Value=".8" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultRadioButton}" TargetType="{x:Type RadioButton}" />
-	<Style x:Key="WD.RepeatButtonTransparent" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RepeatButton}">
-					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ScrollBarThumbVertical" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<Border x:Name="PART_Thumbborder">
-						<Rectangle x:Name="PART_Rectangle" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.InfoPressedSolidColorBrush}" RadiusX="1" RadiusY="1" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ScrollBarThumbHorizontal" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<Border x:Name="PART_Thumbborder">
-						<Rectangle x:Name="PART_Rectangle" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.InfoPressedSolidColorBrush}" RadiusX="1" RadiusY="1" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultScrollBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollBar}">
-		<Style.Resources>
-			<Storyboard x:Key="ScrollMouseOut">
-				<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="2" Duration="00:00:0.1" />
-			</Storyboard>
-			<Storyboard x:Key="ScrollMouseOver">
-				<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="10" Duration="00:00:0.1" />
-			</Storyboard>
-		</Style.Resources>
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Width" Value="12" />
-		<Setter Property="MinWidth" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ScrollBar}">
-					<controls:SmallPanel x:Name="Bg" Width="{TemplateBinding Width}" Background="Transparent" SnapsToDevicePixels="True">
-						<Track x:Name="PART_Track" Width="2" Margin="0,0,1,0" HorizontalAlignment="Right" IsDirectionReversed="True" IsEnabled="{TemplateBinding IsMouseOver}">
-							<Track.DecreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-							</Track.DecreaseRepeatButton>
-							<Track.IncreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-							</Track.IncreaseRepeatButton>
-							<Track.Thumb>
-								<Thumb Style="{StaticResource WD.ScrollBarThumbVertical}" />
-							</Track.Thumb>
-						</Track>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource ScrollMouseOut}" />
-							</Trigger.ExitActions>
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource ScrollMouseOver}" />
-							</Trigger.EnterActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Horizontal">
-				<Setter Property="Width" Value="Auto" />
-				<Setter Property="MinWidth" Value="0" />
-				<Setter Property="Height" Value="12" />
-				<Setter Property="MinHeight" Value="8" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="{x:Type ScrollBar}">
-							<ControlTemplate.Resources>
-								<Storyboard x:Key="ScrollMouseOutHeight">
-									<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="2" Duration="00:00:0.1" />
-								</Storyboard>
-								<Storyboard x:Key="ScrollMouseOverHeight">
-									<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="10" Duration="00:00:0.1" />
-								</Storyboard>
-							</ControlTemplate.Resources>
-							<controls:SmallPanel Height="{TemplateBinding Height}" Background="Transparent" SnapsToDevicePixels="True">
-								<Track x:Name="PART_Track" Height="2" Margin="0,0,0,1" VerticalAlignment="Bottom" IsEnabled="{TemplateBinding IsMouseOver}" Visibility="Hidden">
-									<Track.DecreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-									</Track.DecreaseRepeatButton>
-									<Track.IncreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-									</Track.IncreaseRepeatButton>
-									<Track.Thumb>
-										<Thumb Style="{StaticResource WD.ScrollBarThumbHorizontal}" />
-									</Track.Thumb>
-								</Track>
-							</controls:SmallPanel>
-							<ControlTemplate.Triggers>
-								<Trigger Property="IsMouseOver" Value="True">
-									<Trigger.ExitActions>
-										<BeginStoryboard Storyboard="{StaticResource ScrollMouseOutHeight}" />
-									</Trigger.ExitActions>
-									<Trigger.EnterActions>
-										<BeginStoryboard Storyboard="{StaticResource ScrollMouseOverHeight}" />
-									</Trigger.EnterActions>
-								</Trigger>
-							</ControlTemplate.Triggers>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.ScrollBarHideStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollBar}">
-		<Style.Resources>
-			<Storyboard x:Key="ScrollMouseOut">
-				<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="2" Duration="00:00:0.1" />
-			</Storyboard>
-			<Storyboard x:Key="ScrollMouseOver">
-				<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="10" Duration="00:00:0.1" />
-			</Storyboard>
-		</Style.Resources>
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Width" Value="12" />
-		<Setter Property="MinWidth" Value="8" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ScrollBar}">
-					<controls:SmallPanel Width="{TemplateBinding Width}" Background="Transparent" SnapsToDevicePixels="True">
-						<Track x:Name="PART_Track" Width="2" Margin="0,0,1,0" HorizontalAlignment="Right" IsDirectionReversed="True" IsEnabled="{TemplateBinding IsMouseOver}">
-							<Track.DecreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-							</Track.DecreaseRepeatButton>
-							<Track.IncreaseRepeatButton>
-								<RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-							</Track.IncreaseRepeatButton>
-							<Track.Thumb>
-								<Thumb Style="{StaticResource WD.ScrollBarThumbVertical}" />
-							</Track.Thumb>
-						</Track>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Trigger.ExitActions>
-								<BeginStoryboard Storyboard="{StaticResource ScrollMouseOut}" />
-							</Trigger.ExitActions>
-							<Trigger.EnterActions>
-								<BeginStoryboard Storyboard="{StaticResource ScrollMouseOver}" />
-							</Trigger.EnterActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Horizontal">
-				<Setter Property="Width" Value="Auto" />
-				<Setter Property="MinWidth" Value="0" />
-				<Setter Property="Height" Value="12" />
-				<Setter Property="MinHeight" Value="8" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="{x:Type ScrollBar}">
-							<ControlTemplate.Resources>
-								<Storyboard x:Key="ScrollMouseOutHeight">
-									<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="2" Duration="00:00:0.1" />
-								</Storyboard>
-								<Storyboard x:Key="ScrollMouseOverHeight">
-									<DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="10" Duration="00:00:0.1" />
-								</Storyboard>
-							</ControlTemplate.Resources>
-							<controls:SmallPanel Height="{TemplateBinding Height}" Background="Transparent" SnapsToDevicePixels="True">
-								<Track x:Name="PART_Track" Height="2" Margin="0,0,0,1" VerticalAlignment="Bottom" IsEnabled="{TemplateBinding IsMouseOver}" Visibility="Hidden">
-									<Track.DecreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-									</Track.DecreaseRepeatButton>
-									<Track.IncreaseRepeatButton>
-										<RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
-									</Track.IncreaseRepeatButton>
-									<Track.Thumb>
-										<Thumb Style="{StaticResource WD.ScrollBarThumbHorizontal}" />
-									</Track.Thumb>
-								</Track>
-							</controls:SmallPanel>
-							<ControlTemplate.Triggers>
-								<Trigger Property="IsMouseOver" Value="True">
-									<Trigger.ExitActions>
-										<BeginStoryboard Storyboard="{StaticResource ScrollMouseOutHeight}" />
-									</Trigger.ExitActions>
-									<Trigger.EnterActions>
-										<BeginStoryboard Storyboard="{StaticResource ScrollMouseOverHeight}" />
-									</Trigger.EnterActions>
-								</Trigger>
-							</ControlTemplate.Triggers>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.DefaultScrollViewer" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollViewer}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<Grid Background="{TemplateBinding Background}">
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="*" />
-							<ColumnDefinition Width="Auto" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="{TemplateBinding Padding}" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-						<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="0" Grid.Column="1" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
-						<ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultScrollBar}" TargetType="{x:Type ScrollBar}" />
-	<Style BasedOn="{StaticResource WD.DefaultScrollViewer}" TargetType="{x:Type ScrollViewer}" />
-	<Style x:Key="WD.SliderThumbStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="Width" Value="12" />
-		<Setter Property="Height" Value="12" />
-		<Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1.5" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="OverridesDefaultStyle" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="WD.ThumbMouseOver">
-							<DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="1.2" To="1.4" Duration="00:00:0.1" />
-							<DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1.2" To="1.4" Duration="00:00:0.1" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="6" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="True">
-						<Border.RenderTransform>
-							<ScaleTransform ScaleX="1.2" ScaleY="1.2" />
-						</Border.RenderTransform>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboard" Storyboard="{StaticResource WD.ThumbMouseOver}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
-		<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>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="WD.SliderHorizontal" TargetType="{x:Type Slider}">
-		<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="True" SnapsToDevicePixels="True">
-			<Grid>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
-					<RowDefinition Height="Auto" />
-				</Grid.RowDefinitions>
-				<TickBar x:Name="TopTick" Grid.Row="0" Height="4" Margin="0,0,0,2" Fill="{TemplateBinding Foreground}" Placement="Top" Visibility="Collapsed" />
-				<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}" />
-					</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}" />
-					</Track.IncreaseRepeatButton>
-					<Track.Thumb>
-						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
-					</Track.Thumb>
-				</Track>
-			</Grid>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-				<Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.SliderVertical" TargetType="{x:Type Slider}">
-		<Border Padding="{TemplateBinding Padding}" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="True" SnapsToDevicePixels="True">
-			<Grid>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="Auto" MinWidth="{TemplateBinding MinWidth}" />
-					<ColumnDefinition Width="Auto" />
-				</Grid.ColumnDefinitions>
-				<TickBar x:Name="TopTick" Grid.Column="0" Width="4" Margin="0,0,2,0" Fill="{TemplateBinding Foreground}" Placement="Left" Visibility="Collapsed" />
-				<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}" />
-					</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}" />
-					</Track.IncreaseRepeatButton>
-					<Track.Thumb>
-						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
-					</Track.Thumb>
-				</Track>
-			</Grid>
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="TickPlacement" Value="TopLeft">
-				<Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="BottomRight">
-				<Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-			<Trigger Property="TickPlacement" Value="Both">
-				<Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
-				<Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="WD.DefaultSlider" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Slider}">
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="SelectionEnd" Value="{Binding RelativeSource={RelativeSource Self}, Path=Value}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template" Value="{StaticResource WD.SliderHorizontal}" />
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="Template" Value="{StaticResource WD.SliderVertical}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultSlider}" TargetType="{x:Type Slider}" />
-	<Style x:Key="WD.DefaultHyperlink" TargetType="{x:Type Hyperlink}">
-		<Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
-		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
-		<Setter Property="FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
-		<Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
-		<Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
-		<Setter Property="TextBlock.TextDecorations" Value="{x:Null}" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="TextBlock.TextDecorations">
-					<Setter.Value>
-						<TextDecorationCollection>
-							<TextDecoration Location="Underline" />
-						</TextDecorationCollection>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultHyperlink}" TargetType="{x:Type Hyperlink}" />
-	<Style x:Key="WD.DefaultCheckBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CheckBox}">
-		<Setter Property="Padding" Value="4,0" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type CheckBox}">
-					<BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
-						<BulletDecorator.Bullet>
-							<Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" CornerRadius="{Binding ElementName=PART_Border, Path=CornerRadius}">
-								<Border x:Name="PART_Border" Width="16" Height="16" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-									<controls:SmallPanel>
-										<Path x:Name="PART_CheckMark" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="False" Stretch="Fill">
-											<Path.RenderTransform>
-												<ScaleTransform ScaleX="0" ScaleY="0" />
-											</Path.RenderTransform>
-										</Path>
-										<Rectangle x:Name="PART_InderminateMark" Width="6" Height="2" HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" RenderTransformOrigin=".5,.5">
-											<Rectangle.RenderTransform>
-												<ScaleTransform ScaleX="0" />
-											</Rectangle.RenderTransform>
-										</Rectangle>
-									</controls:SmallPanel>
-								</Border>
-							</Border>
-						</BulletDecorator.Bullet>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CheckStates">
-								<VisualState x:Name="Checked">
-									<Storyboard>
-										<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_CheckMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleX)" To=".7" Duration="00:00:.2" />
-										<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_CheckMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleY)" To=".5" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unchecked" />
-								<VisualState x:Name="Indeterminate" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</BulletDecorator>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsChecked" Value="{x:Null}">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="PART_BeginStoryboardIsCheckedNull">
-									<Storyboard>
-										<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_InderminateMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</BeginStoryboard>
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<RemoveStoryboard BeginStoryboardName="PART_BeginStoryboardIsCheckedNull" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsChecked" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultCheckBox}" TargetType="{x:Type CheckBox}" />
-	<Style x:Key="WD.DefaultTextBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TextBox}">
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="AllowDrop" Value="True" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="SelectionBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type TextBox}">
-					<Border Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<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>
-						<Trigger Property="Text" Value="">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Text" Value="{x:Null}">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<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>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}" />
-	<ControlTemplate x:Key="WD.ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-		<Border x:Name="PART_Border" Padding="6,0" BorderThickness="0" SnapsToDevicePixels="true">
-			<Grid Background="Transparent">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition />
-					<ColumnDefinition Width="30" />
-				</Grid.ColumnDefinitions>
-				<Rectangle Grid.Column="1" Width="30" Height="Auto" Margin="0,1" Fill="{TemplateBinding Background}" />
-				<Path x:Name="PART_Arrow" Grid.Column="1" Width="10" Height="6" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.ChevronDownGeometry}" RenderTransformOrigin=".5,.5" Stretch="Fill">
-					<Path.Fill>
-						<SolidColorBrush Color="{DynamicResource WD.PlaceholderTextColor}" />
-					</Path.Fill>
-					<Path.RenderTransform>
-						<RotateTransform Angle="0" />
-					</Path.RenderTransform>
-				</Path>
-			</Grid>
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="CommonStates">
-					<VisualState x:Name="Normal" />
-					<VisualState x:Name="MouseOver" />
-					<VisualState x:Name="Pressed" />
-					<VisualState x:Name="Disabled" />
-				</VisualStateGroup>
-				<VisualStateGroup x:Name="CheckStates">
-					<VisualState x:Name="Checked">
-						<Storyboard>
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Arrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-180" Duration="00:00:.3" />
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="Unchecked">
-						<Storyboard>
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Arrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.3" />
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="Indeterminate" />
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-		</Border>
-	</ControlTemplate>
-	<Style x:Key="WD.DefaultComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ComboBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ComboBox}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OpenStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-						</Storyboard>
-						<Storyboard x:Key="CloseStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<controls:SmallPanel>
-							<ContentPresenter x:Name="ContentSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
-							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Visibility="Hidden" />
-							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
-							<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
-							<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" AllowsTransparency="True" Focusable="False" HorizontalOffset="-1" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" StaysOpen="False">
-								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
-									<controls:SmallPanel.RenderTransform>
-										<ScaleTransform ScaleY="0" />
-									</controls:SmallPanel.RenderTransform>
-									<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-									<ScrollViewer Margin="0,8" ClipToBounds="False" ScrollViewer.VerticalScrollBarVisibility="Auto">
-										<ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" />
-									</ScrollViewer>
-								</controls:SmallPanel>
-							</Popup>
-							<VisualStateManager.VisualStateGroups>
-								<VisualStateGroup x:Name="CommonStates">
-									<VisualState x:Name="Normal" />
-									<VisualState x:Name="MouseOver">
-										<Storyboard>
-											<ColorAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="{DynamicResource WD.PrimaryNormalColor}" Duration="00:00:.1" />
-										</Storyboard>
-									</VisualState>
-									<VisualState x:Name="Disabled" />
-								</VisualStateGroup>
-								<VisualStateGroup x:Name="EditStates">
-									<VisualState x:Name="Editable" />
-									<VisualState x:Name="Uneditable" />
-								</VisualStateGroup>
-							</VisualStateManager.VisualStateGroups>
-						</controls:SmallPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="HasItems" Value="False">
-							<Setter TargetName="PART_DropDownBorder" Property="MinHeight" Value="95" />
-						</Trigger>
-						<Trigger Property="IsGrouping" Value="True">
-							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-						</Trigger>
-						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
-							<Setter TargetName="PART_DropDownBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
-							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
-						</Trigger>
-						<Trigger Property="ComboBox.IsEditable" Value="True">
-							<Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
-							<Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
-							<Setter TargetName="ContentSite" Property="UIElement.Visibility" Value="Hidden" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition SourceName="PART_EditableTextBox" Property="Text" Value="" />
-								<Condition Property="ComboBox.IsEditable" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="SelectionBoxItem" Value="" />
-								<Condition Property="ComboBox.IsEditable" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="SelectionBoxItem" Value="{x:Null}" />
-								<Condition Property="ComboBox.IsEditable" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultComboBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ComboBoxItem}">
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Margin" Value="1,0" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ComboBoxItem}">
-					<Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-						<controls:SmallPanel>
-							<Rectangle x:Name="PART_RectangleMouseOver" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-							<Rectangle x:Name="PART_RectangleSelected" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.BaseSolidColorBrush}" SnapsToDevicePixels="True" UseLayoutRounding="True" Visibility="Collapsed" />
-							<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
-						</controls:SmallPanel>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_RectangleMouseOver" Property="Fill" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-								<Condition Property="IsMouseOver" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Visible" />
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
-						</MultiTrigger>
-						<Trigger Property="IsFocused" Value="True">
-							<Setter TargetName="PART_RectangleMouseOver" Property="Fill" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultComboBoxItem}" TargetType="{x:Type ComboBoxItem}" />
-	<Style BasedOn="{StaticResource WD.DefaultComboBox}" TargetType="{x:Type ComboBox}" />
-	<Style x:Key="WD.DefaultToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Padding" Value="4,0" />
-		<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ToggleButton}">
-					<BulletDecorator Background="Transparent">
-						<BulletDecorator.Bullet>
-							<Border x:Name="PART_Border" Width="40" Height="20" Background="{TemplateBinding Background}" CornerRadius="10">
-								<Ellipse x:Name="PART_Ellipse" Width="16" Height="16" Margin="2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{DynamicResource WD.WindowForegroundColorBrush}">
-									<Ellipse.RenderTransform>
-										<TranslateTransform />
-									</Ellipse.RenderTransform>
-								</Ellipse>
-							</Border>
-						</BulletDecorator.Bullet>
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CheckStates">
-								<VisualState x:Name="Checked">
-									<Storyboard>
-										<DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)" To="20" Duration="00:00:.3" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unchecked">
-									<Storyboard>
-										<DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)" To="0" Duration="00:00:.3" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Indeterminate" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</BulletDecorator>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsChecked" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultToggleButton}" TargetType="{x:Type ToggleButton}" />
-	<Style x:Key="WD.CalendarDayButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarDayButton}">
-		<Setter Property="Width" Value="32" />
-		<Setter Property="Height" Value="32" />
-		<Setter Property="FontSize" Value="12" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="1" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CalendarDayButton">
-					<controls:SmallPanel>
-						<Ellipse x:Name="SelectedBackground" Margin="{TemplateBinding Padding}" Opacity="0">
-							<Ellipse.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-							</Ellipse.Fill>
-						</Ellipse>
-						<Ellipse x:Name="SelectionBackground" Margin="{TemplateBinding Padding}" Opacity="0">
-							<Ellipse.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-							</Ellipse.Fill>
-						</Ellipse>
-						<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-						<Ellipse x:Name="DayButtonFocusVisual" Width="5" Height="5" HorizontalAlignment="Center" VerticalAlignment="Bottom" IsHitTestVisible="False" Visibility="Collapsed">
-							<Ellipse.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-							</Ellipse.Fill>
-						</Ellipse>
-						<ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<TextElement.Foreground>
-								<SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-							</TextElement.Foreground>
-						</ContentPresenter>
-						<Line x:Name="Blackout" Margin="8,3,8,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".4" Stroke="{DynamicResource WD.PrimaryTextSolidColorBrush}" StrokeThickness="1.5" Visibility="Collapsed" X1="0" X2="{TemplateBinding Width}" Y1="0" Y2="0" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup Name="CommonStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0:0:0.1" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Normal" />
-								<VisualState Name="MouseOver" />
-								<VisualState Name="Pressed" />
-								<VisualState Name="Disabled" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="SelectionStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Unselected" />
-								<VisualState Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="SelectionBackground" Storyboard.TargetProperty="Opacity" To=".3" Duration="0" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup Name="CalendarButtonFocusStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="CalendarButtonFocused" />
-								<VisualState Name="CalendarButtonUnfocused" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="ActiveStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Active" />
-								<VisualState Name="Inactive" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="DayStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="RegularDay" />
-								<VisualState Name="Today" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="BlackoutDayStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="NormalDay" />
-								<VisualState Name="BlackoutDay" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsToday" Value="True">
-							<Setter TargetName="NormalText" Property="TextElement.FontWeight" Value="Bold" />
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-								<Condition Property="IsBlackedOut" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-							<!--<Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Collapsed"/>-->
-							<Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-							<Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
-							<Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-								<Condition Property="IsMouseOver" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="SelectedBackground" Property="Opacity" Value="1" />
-							<Setter TargetName="SelectionBackground" Property="Opacity" Value="0" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="True" />
-								<Condition Property="IsInactive" Value="True" />
-								<Condition Property="IsBlackedOut" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsMouseOver" Value="False" />
-								<Condition Property="IsInactive" Value="True" />
-								<Condition Property="IsBlackedOut" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsBlackedOut" Value="True">
-							<Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.CalendarButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarButton}">
-		<Setter Property="MinWidth" Value="48" />
-		<Setter Property="MinHeight" Value="32" />
-		<Setter Property="FontSize" Value="12" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="4,10" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="CalendarButton">
-					<controls:SmallPanel>
-						<Ellipse x:Name="SelectionBackground" Margin="{TemplateBinding Padding}" Opacity=".3" Visibility="Collapsed">
-							<Ellipse.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-							</Ellipse.Fill>
-						</Ellipse>
-						<ContentPresenter x:Name="NormalText" Margin="3,20" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<TextElement.Foreground>
-								<SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-							</TextElement.Foreground>
-						</ContentPresenter>
-						<Ellipse x:Name="ButtonFocusVisual" Width="5" Height="5" HorizontalAlignment="Center" VerticalAlignment="Bottom" IsHitTestVisible="False">
-							<Ellipse.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-							</Ellipse.Fill>
-							<Ellipse.Visibility>
-								<MultiBinding Converter="{StaticResource WD.DatePickerToCurrentConverter}">
-									<Binding ElementName="NormalText" Path="Content" />
-									<Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type CalendarButton}, AncestorLevel=1}" />
-									<Binding Path="DataContext" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type CalendarButton}, AncestorLevel=1}" />
-								</MultiBinding>
-							</Ellipse.Visibility>
-						</Ellipse>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup Name="CommonStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0:0:0.1" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Normal" />
-								<VisualState Name="MouseOver">
-									<Storyboard>
-										<ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-											<EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryMouseOverColor}" />
-										</ColorAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState Name="Pressed" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="SelectionStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Unselected" />
-								<VisualState Name="Selected">
-									<Storyboard>
-										<ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-											<EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
-										</ColorAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-							<VisualStateGroup Name="ActiveStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Active" />
-								<VisualState Name="Inactive" />
-							</VisualStateGroup>
-							<VisualStateGroup Name="CalendarButtonFocusStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="CalendarButtonFocused">
-									<Storyboard>
-										<ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-											<EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
-										</ColorAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState Name="CalendarButtonUnfocused" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsInactive" Value="True">
-							<Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="SelectionBackground" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<ControlTemplate x:Key="WD.PreviousButtonTemplate" TargetType="{x:Type Button}">
-		<controls:SmallPanel>
-			<controls:SmallPanel Background="Transparent">
-				<Path x:Name="PART_Path" Width="6" Height="10" Margin="14,-6,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Data="{StaticResource WD.PreviousGeometry}" Stretch="Fill">
-					<Path.Fill>
-						<SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-					</Path.Fill>
-				</Path>
-			</controls:SmallPanel>
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="CommonStates">
-					<VisualState x:Name="Normal" />
-					<VisualState x:Name="MouseOver">
-						<Storyboard>
-							<ColorAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" To="{DynamicResource WD.PrimaryMouseOverColor}" Duration="0" />
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="Disabled">
-						<Storyboard>
-							<DoubleAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" To=".5" Duration="0" />
-						</Storyboard>
-					</VisualState>
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-		</controls:SmallPanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.NextButtonTemplate" TargetType="{x:Type Button}">
-		<controls:SmallPanel>
-			<controls:SmallPanel Background="Transparent">
-				<Path x:Name="PART_Path" Width="6" Height="10" Margin="0,-6,14,0" HorizontalAlignment="Right" VerticalAlignment="Center" Data="{StaticResource WD.NextGeometry}" Stretch="Fill">
-					<Path.Fill>
-						<SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-					</Path.Fill>
-				</Path>
-			</controls:SmallPanel>
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="CommonStates">
-					<VisualState x:Name="Normal" />
-					<VisualState x:Name="MouseOver">
-						<Storyboard>
-							<ColorAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" To="{StaticResource WD.PrimaryMouseOverColor}" Duration="0" />
-						</Storyboard>
-					</VisualState>
-					<VisualState x:Name="Disabled">
-						<Storyboard>
-							<DoubleAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" To=".5" Duration="0" />
-						</Storyboard>
-					</VisualState>
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-		</controls:SmallPanel>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.HeaderButtonTemplate" TargetType="{x:Type Button}">
-		<controls:SmallPanel>
-			<ContentPresenter x:Name="PART_ButtonContent" Margin="1,4,1,9" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
-			<VisualStateManager.VisualStateGroups>
-				<VisualStateGroup x:Name="CommonStates">
-					<VisualState x:Name="Normal" />
-					<VisualState x:Name="MouseOver" />
-					<VisualState x:Name="Disabled">
-						<Storyboard>
-							<DoubleAnimation Storyboard.TargetName="PART_ButtonContent" Storyboard.TargetProperty="Opacity" To=".5" Duration="0" />
-						</Storyboard>
-					</VisualState>
-				</VisualStateGroup>
-			</VisualStateManager.VisualStateGroups>
-		</controls:SmallPanel>
-	</ControlTemplate>
-	<Style x:Key="WD.CalendarItemStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarItem}">
-		<Setter Property="Margin" Value="24,4,24,24" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type CalendarItem}">
-					<ControlTemplate.Resources>
-						<DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
-							<StackPanel>
-								<TextBlock Margin="0,6" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="12" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" Text="{Binding}" />
-								<Rectangle Height="1" VerticalAlignment="Bottom" Fill="{DynamicResource WD.BaseSolidColorBrush}" />
-							</StackPanel>
-						</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.Effect>
-								<DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
-							</Border.Effect>
-							<Grid Margin="0,20,0,0">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<Grid.RowDefinitions>
-									<RowDefinition Height="Auto" />
-									<RowDefinition Height="*" />
-								</Grid.RowDefinitions>
-								<Button x:Name="PART_PreviousButton" Grid.Row="0" Grid.Column="0" Width="28" Height="20" HorizontalAlignment="Left" Focusable="False" Template="{StaticResource WD.PreviousButtonTemplate}" />
-								<Button x:Name="PART_HeaderButton" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" FontSize="14" Template="{StaticResource WD.HeaderButtonTemplate}" />
-								<Button x:Name="PART_NextButton" Grid.Row="0" Grid.Column="2" Width="28" Height="20" HorizontalAlignment="Right" Focusable="False" Template="{StaticResource WD.NextButtonTemplate}" />
-								<Grid x:Name="PART_MonthView" Grid.Row="1" Grid.ColumnSpan="3" Margin="6,10" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Visible">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-									</Grid.RowDefinitions>
-								</Grid>
-								<Grid x:Name="PART_YearView" Grid.Row="1" Grid.ColumnSpan="3" Margin="6,-3,7,6" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Hidden">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-										<ColumnDefinition Width="Auto" />
-									</Grid.ColumnDefinitions>
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-									</Grid.RowDefinitions>
-								</Grid>
-							</Grid>
-						</Border>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="Disabled" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
-							<Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-						</DataTrigger>
-						<DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
-							<Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
-						</DataTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultCalendar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Calendar}">
-		<Setter Property="CalendarButtonStyle" Value="{StaticResource WD.CalendarButtonStyle}" />
-		<Setter Property="CalendarDayButtonStyle" Value="{StaticResource WD.CalendarDayButtonStyle}" />
-		<Setter Property="CalendarItemStyle" Value="{StaticResource WD.CalendarItemStyle}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Calendar}">
-					<StackPanel x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
-						<CalendarItem x:Name="PART_CalendarItem" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Style="{TemplateBinding CalendarItemStyle}" />
-					</StackPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DropDownButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="Button">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="30" />
-							<ColumnDefinition />
-						</Grid.ColumnDefinitions>
-						<Border x:Name="Border" Grid.ColumnSpan="2" Background="{DynamicResource WD.BackgroundSolidColorBrush}" />
-						<Grid Width="19" Height="18" HorizontalAlignment="Center" VerticalAlignment="Center" FlowDirection="LeftToRight">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="20*" />
-								<ColumnDefinition Width="20*" />
-								<ColumnDefinition Width="20*" />
-								<ColumnDefinition Width="20*" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<RowDefinition Height="23*" />
-								<RowDefinition Height="19*" />
-								<RowDefinition Height="19*" />
-								<RowDefinition Height="19*" />
-							</Grid.RowDefinitions>
-							<Border x:Name="Highlight" Grid.Row="0" Grid.RowSpan="4" Grid.ColumnSpan="4" Margin="-1" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,1,1" Opacity="1" />
-							<Border x:Name="Background" Grid.Row="1" Grid.RowSpan="3" Grid.ColumnSpan="4" Margin="0,-1,0,0" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius=".5" Opacity="1" />
-							<Border x:Name="BackgroundGradient" Grid.Row="1" Grid.RowSpan="3" Grid.ColumnSpan="4" Margin="0,-1,0,0" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius=".5" Opacity="1" />
-							<Rectangle Grid.RowSpan="1" Grid.ColumnSpan="4" Fill="{DynamicResource WD.RegularTextSolidColorBrush}" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1" />
-							<Path Grid.Row="1" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" Margin="4,3,4,3" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.DatePickerGeometry}" Fill="{DynamicResource WD.RegularTextSolidColorBrush}" RenderTransformOrigin="0.5,0.5" Stretch="Fill" />
-							<Ellipse Grid.ColumnSpan="4" Width="3" Height="3" HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" StrokeThickness="0" />
-							<Border x:Name="DisabledVisual" Grid.Row="0" Grid.RowSpan="4" Grid.ColumnSpan="4" BorderBrush="{DynamicResource WD.BackgroundSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,.5,.5" Opacity="0" />
-						</Grid>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultDatePickerTextBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePickerTextBox}">
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="DatePickerTextBox">
-					<controls:SmallPanel>
-						<Border x:Name="Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-							<controls:SmallPanel x:Name="WatermarkContent">
-								<ContentControl x:Name="PART_Watermark" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:DatePickerHelper.TextTrimming="WordEllipsis" Background="Transparent" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Opacity="0" />
-								<ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
-							</controls:SmallPanel>
-						</Border>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup Name="WatermarkStates">
-								<VisualStateGroup.Transitions>
-									<VisualTransition GeneratedDuration="0" />
-								</VisualStateGroup.Transitions>
-								<VisualState Name="Unwatermarked" />
-								<VisualState Name="Watermarked">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultCalendar}" TargetType="{x:Type Calendar}" />
-	<Style BasedOn="{StaticResource WD.DefaultDatePickerTextBox}" TargetType="{x:Type DatePickerTextBox}" />
-	<Style x:Key="WD.DefaultDataGridSelectAllButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Button}">
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Button}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Polygon x:Name="Arrow" Margin="0,2,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Points="0,10 10,10 10,0" Stretch="Uniform">
-							<Polygon.Fill>
-								<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-							</Polygon.Fill>
-						</Polygon>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</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="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{x:Null}" />
-		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="ScrollViewer.PanningMode" Value="Both" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
-		<Setter Property="HorizontalGridLinesBrush" Value="{x:Null}" />
-		<Setter Property="VerticalGridLinesBrush" Value="{x:Null}" />
-		<Setter Property="CanUserAddRows" Value="False" />
-		<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">
-							<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}}}" />
-										<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}}" />
-										<Grid Grid.Row="2" Grid.Column="1">
-											<Grid.ColumnDefinitions>
-												<ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
-												<ColumnDefinition Width="*" />
-											</Grid.ColumnDefinitions>
-											<ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
-										</Grid>
-									</Grid>
-								</ControlTemplate>
-							</ScrollViewer.Template>
-							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</ScrollViewer>
-					</controls:WDBorder>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsGrouping" Value="True">
-				<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.DefaultDataGridCell" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridCell}">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type DataGridCell}">
-					<Border x:Name="PART_Border" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="FocusStates">
-								<VisualState x:Name="Unfocused" />
-								<VisualState x:Name="Focused" />
-							</VisualStateGroup>
-							<VisualStateGroup x:Name="CurrentStates">
-								<VisualState x:Name="Regular" />
-								<VisualState x:Name="Current" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultDataGridRow" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridRow}">
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="ValidationErrorTemplate">
-			<Setter.Value>
-				<ControlTemplate>
-					<TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Foreground="{DynamicResource WD.DangerPressedSolidColorBrush}" Text="!" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type DataGridRow}">
-					<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<SelectiveScrollingGrid>
-							<SelectiveScrollingGrid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-							</SelectiveScrollingGrid.ColumnDefinitions>
-							<SelectiveScrollingGrid.RowDefinitions>
-								<RowDefinition Height="*" />
-								<RowDefinition Height="Auto" />
-							</SelectiveScrollingGrid.RowDefinitions>
-							<DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-							<DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Visibility="{TemplateBinding DetailsVisibility}" />
-							<DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
-						</SelectiveScrollingGrid>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CommonStates">
-								<VisualState x:Name="Normal" />
-								<VisualState x:Name="Normal_AlternatingRow" />
-								<VisualState x:Name="Normal_Selected" />
-								<VisualState x:Name="Unfocused_Selected" />
-								<VisualState x:Name="Normal_Editing" />
-								<VisualState x:Name="MouseOver_Editing">
-									<Storyboard>
-										<ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.DefaultBackgroundColor}" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="MouseOver_Unfocused_Editing" />
-								<VisualState x:Name="Unfocused_Editing" />
-								<VisualState x:Name="MouseOver">
-									<Storyboard>
-										<ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.BaseMoveColor}" Duration="0:0:0.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="MouseOver_Selected">
-									<Storyboard>
-										<ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.BaseMoveColor}" Duration="0:0:0.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="MouseOver_Unfocused_Selected" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.RowHeaderGripperStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="Height" Value="8" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Cursor" Value="SizeNS" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultDataGridRowHeader" TargetType="{x:Type DataGridRowHeader}">
-		<Setter Property="FontWeight" Value="ExtraBlack" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="Template">
-			<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">
-							<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}}}" />
-							</StackPanel>
-						</Border>
-						<Thumb x:Name="PART_TopHeaderGripper" VerticalAlignment="Top" Style="{StaticResource WD.RowHeaderGripperStyle}" />
-						<Thumb x:Name="PART_BottomHeaderGripper" VerticalAlignment="Bottom" Style="{StaticResource WD.RowHeaderGripperStyle}" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ColumnHeaderGripperStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="Width" Value="8" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Cursor" Value="SizeWE" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<Border Width="{TemplateBinding Width}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultDataGridColumnHeader" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridColumnHeader}">
-		<Setter Property="FontWeight" Value="ExtraBlack" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="StoryboardAscending">
-							<DoubleAnimation Storyboard.TargetName="SortArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="180" Duration="00:00:.2" />
-						</Storyboard>
-						<Storyboard x:Key="StoryboardDescending">
-							<DoubleAnimation Storyboard.TargetName="SortArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel>
-						<Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-							<Grid Name="HedearGrid">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" TextElement.Foreground="{TemplateBinding Foreground}" />
-								<Path x:Name="SortArrow" Grid.Column="1" Width="10" Height="10" Margin="4,0,0,0" VerticalAlignment="Center" Data="{StaticResource WD.SortArrowGeometry}" Fill="{DynamicResource WD.PrimaryPressedSolidColorBrush}" RenderTransformOrigin="0.5,0.5" Stretch="Fill" Visibility="Collapsed">
-									<Path.RenderTransform>
-										<RotateTransform />
-									</Path.RenderTransform>
-								</Path>
-							</Grid>
-						</Border>
-						<Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource WD.ColumnHeaderGripperStyle}" />
-						<Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource WD.ColumnHeaderGripperStyle}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="SortDirection" Value="Ascending">
-							<Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="StoryboardAscendingBeginStoryboard" />
-							</Trigger.ExitActions>
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="StoryboardAscendingBeginStoryboard" Storyboard="{StaticResource StoryboardAscending}" />
-							</Trigger.EnterActions>
-						</Trigger>
-						<Trigger Property="SortDirection" Value="Descending">
-							<Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="StoryboardDescendingBeginStoryboard" />
-							</Trigger.ExitActions>
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="StoryboardDescendingBeginStoryboard" Storyboard="{StaticResource StoryboardDescending}" />
-							</Trigger.EnterActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultDataGridColumnHeadersPresenter" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
-					<controls:SmallPanel>
-						<DataGridColumnHeader x:Name="PART_FillerColumnHeader" IsHitTestVisible="False" />
-						<ItemsPresenter />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultDataGridColumnHeadersPresenter}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
-	<Style BasedOn="{StaticResource WD.DefaultDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}" />
-	<Style BasedOn="{StaticResource WD.DefaultDataGridRowHeader}" TargetType="{x:Type DataGridRowHeader}" />
-	<Style BasedOn="{StaticResource WD.DefaultDataGridRow}" TargetType="{x:Type DataGridRow}" />
-	<Style BasedOn="{StaticResource WD.DefaultDataGridCell}" TargetType="{x:Type DataGridCell}" />
-	<Style BasedOn="{StaticResource WD.DefaultDataGrid}" TargetType="{x:Type DataGrid}" />
-	<Style x:Key="WD.BaseTAndBTabItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabItem}">
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="BorderThickness" Value="{StaticResource WD.TabItemBorderThickness}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type TabItem}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" RenderTransformOrigin=".5,.5">
-							<Border.RenderTransform>
-								<ScaleTransform ScaleX="0" ScaleY="1" />
-							</Border.RenderTransform>
-						</Border>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.BaseLAndRTabItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabItem}">
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="BorderThickness" Value="{StaticResource WD.TabItemBorderThickness}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type TabItem}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" RenderTransformOrigin=".5,.5">
-							<Border.RenderTransform>
-								<ScaleTransform ScaleX="1" ScaleY="0" />
-							</Border.RenderTransform>
-						</Border>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.LeftTabItem" BasedOn="{StaticResource WD.BaseLAndRTabItem}" TargetType="{x:Type TabItem}">
-		<Setter Property="BorderThickness" Value="0,0,2,0" />
-	</Style>
-	<Style x:Key="WD.RightTabItem" BasedOn="{StaticResource WD.BaseLAndRTabItem}" TargetType="{x:Type TabItem}">
-		<Setter Property="BorderThickness" Value="2,0,0,0" />
-	</Style>
-	<Style x:Key="WD.TopTabItem" BasedOn="{StaticResource WD.BaseTAndBTabItem}" TargetType="{x:Type TabItem}">
-		<Setter Property="BorderThickness" Value="0,0,0,2" />
-	</Style>
-	<Style x:Key="WD.BottomTabItem" BasedOn="{StaticResource WD.BaseTAndBTabItem}" TargetType="{x:Type TabItem}">
-		<Setter Property="BorderThickness" Value="0,2,0,0" />
-	</Style>
-	<Style x:Key="WD.DefaultTabControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabControl}">
-		<Setter Property="TabStripPlacement" Value="Top" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.TopTabItem}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<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}">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Name="ColumnDefinition0" />
-								<ColumnDefinition Name="ColumnDefinition1" Width="0" />
-							</Grid.ColumnDefinitions>
-							<Grid.RowDefinitions>
-								<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>
-							<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>
-					<ControlTemplate.Triggers>
-						<Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
-							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
-							<Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="Auto" />
-							<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">
-							<Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="ContentPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="ColumnDefinition0" Property="ColumnDefinition.Width" Value="Auto" />
-							<Setter TargetName="ColumnDefinition1" Property="ColumnDefinition.Width" Value="*" />
-							<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">
-							<Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
-							<Setter TargetName="HeaderBorder" Property="Grid.Column" Value="1" />
-							<Setter TargetName="ContentPanel" Property="Grid.Column" Value="0" />
-							<Setter TargetName="ColumnDefinition0" Property="ColumnDefinition.Width" Value="*" />
-							<Setter TargetName="ColumnDefinition1" Property="ColumnDefinition.Width" Value="Auto" />
-							<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>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultTabControl}" TargetType="{x:Type TabControl}" />
-	<Style x:Key="WD.DefaultPasswordBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type PasswordBox}">
-		<Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="PasswordChar" Value="●" />
-		<Setter Property="AllowDrop" Value="True" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="helpers:PasswordBoxHelper.IsMonitoring" Value="True" />
-		<Setter Property="SelectionBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type PasswordBox}">
-					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<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>
-						<Trigger Property="helpers:PasswordBoxHelper.PasswordLength" Value="0">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<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>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultPasswordBox}" TargetType="{x:Type PasswordBox}" />
-	<Style x:Key="WD.DefaultExpander" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Expander}">
-		<Setter Property="BorderThickness" Value="1" />
-		<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="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">
-						<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}}">
-														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
-															<Grid.ColumnDefinitions>
-																<ColumnDefinition Width="19" />
-																<ColumnDefinition Width="*" />
-															</Grid.ColumnDefinitions>
-															<Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
-																<Path.Fill>
-																	<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-																</Path.Fill>
-																<Path.RenderTransform>
-																	<RotateTransform />
-																</Path.RenderTransform>
-															</Path>
-															<ContentPresenter Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
-														</Grid>
-														<VisualStateManager.VisualStateGroups>
-															<VisualStateGroup x:Name="CheckStates">
-																<VisualState x:Name="Checked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Unchecked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Indeterminate" />
-															</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.RenderTransform>
-									<ScaleTransform ScaleY="0" />
-								</Border.RenderTransform>
-								<ContentPresenter x:Name="ExpandSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" />
-							</Border>
-						</DockPanel>
-					</Border>
-					<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" />
-							<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Left" />
-							<Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value="0,.5" />
-							<Setter TargetName="PART_Content" Property="RenderTransform">
-								<Setter.Value>
-									<ScaleTransform ScaleX="0" />
-								</Setter.Value>
-							</Setter>
-							<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}}">
-														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
-															<Grid.RowDefinitions>
-																<RowDefinition Height="19" />
-																<RowDefinition Height="*" />
-															</Grid.RowDefinitions>
-															<controls:SmallPanel>
-																<controls:SmallPanel.LayoutTransform>
-																	<TransformGroup>
-																		<RotateTransform Angle="90" />
-																	</TransformGroup>
-																</controls:SmallPanel.LayoutTransform>
-																<Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
-																	<Path.Fill>
-																		<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-																	</Path.Fill>
-																	<Path.RenderTransform>
-																		<RotateTransform />
-																	</Path.RenderTransform>
-																</Path>
-															</controls:SmallPanel>
-															<ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
-														</Grid>
-														<VisualStateManager.VisualStateGroups>
-															<VisualStateGroup x:Name="CheckStates">
-																<VisualState x:Name="Checked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-90" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Unchecked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Indeterminate" />
-															</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>
-									</Style>
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<Trigger Property="ExpandDirection" Value="Up">
-							<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
-							<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Bottom" />
-							<Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value=".5,1" />
-							<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}}">
-														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
-															<Grid.ColumnDefinitions>
-																<ColumnDefinition Width="19" />
-																<ColumnDefinition Width="*" />
-															</Grid.ColumnDefinitions>
-															<controls:SmallPanel>
-																<Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
-																	<Path.Fill>
-																		<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-																	</Path.Fill>
-																	<Path.RenderTransform>
-																		<RotateTransform />
-																	</Path.RenderTransform>
-																</Path>
-															</controls:SmallPanel>
-															<ContentPresenter Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
-														</Grid>
-														<VisualStateManager.VisualStateGroups>
-															<VisualStateGroup x:Name="CheckStates">
-																<VisualState x:Name="Checked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-90" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Unchecked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Indeterminate" />
-															</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>
-									</Style>
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<Trigger Property="ExpandDirection" Value="Left">
-							<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
-							<Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Right" />
-							<Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value="1,.5" />
-							<Setter TargetName="PART_Content" Property="RenderTransform">
-								<Setter.Value>
-									<ScaleTransform ScaleX="0" />
-								</Setter.Value>
-							</Setter>
-							<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}}">
-														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
-															<Grid.RowDefinitions>
-																<RowDefinition Height="19" />
-																<RowDefinition Height="*" />
-															</Grid.RowDefinitions>
-															<controls:SmallPanel>
-																<controls:SmallPanel.LayoutTransform>
-																	<TransformGroup>
-																		<RotateTransform Angle="90" />
-																	</TransformGroup>
-																</controls:SmallPanel.LayoutTransform>
-																<Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
-																	<Path.Fill>
-																		<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-																	</Path.Fill>
-																	<Path.RenderTransform>
-																		<RotateTransform />
-																	</Path.RenderTransform>
-																</Path>
-															</controls:SmallPanel>
-															<ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
-														</Grid>
-														<VisualStateManager.VisualStateGroups>
-															<VisualStateGroup x:Name="CheckStates">
-																<VisualState x:Name="Checked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Unchecked">
-																	<Storyboard>
-																		<DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-																	</Storyboard>
-																</VisualState>
-																<VisualState x:Name="Indeterminate" />
-															</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>
-									</Style>
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsExpanded" Value="True" />
-								<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>
-										<DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</BeginStoryboard>
-							</MultiTrigger.EnterActions>
-							<MultiTrigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PART_DownBeginStoryboard" />
-							</MultiTrigger.ExitActions>
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsExpanded" Value="True" />
-								<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>
-										<DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</BeginStoryboard>
-							</MultiTrigger.EnterActions>
-							<MultiTrigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PART_RightBeginStoryboard" />
-							</MultiTrigger.ExitActions>
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsExpanded" Value="True" />
-								<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>
-										<DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</BeginStoryboard>
-							</MultiTrigger.EnterActions>
-							<MultiTrigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PART_UpBeginStoryboard" />
-							</MultiTrigger.ExitActions>
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsExpanded" Value="True" />
-								<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>
-										<DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</BeginStoryboard>
-							</MultiTrigger.EnterActions>
-							<MultiTrigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PART_LeftBeginStoryboard" />
-							</MultiTrigger.ExitActions>
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultExpander}" TargetType="{x:Type Expander}" />
-	<Style x:Key="WD.DefaultGroupBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GroupBox}">
-		<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.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">
-							<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">
-							<ContentPresenter Margin="{TemplateBinding Padding}" />
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultGroupBox}" TargetType="{x:Type GroupBox}" />
-	<Style x:Key="WD.DefaultListBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<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="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">
-							<VirtualizingStackPanel IsItemsHost="True" />
-						</ScrollViewer>
-					</controls:WDBorder>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsGrouping" Value="True">
-							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ListBoxItem">
-					<controls:SmallPanel>
-						<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}" />
-						</Border>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="SelectionStates">
-								<VisualState x:Name="Unselected" />
-								<VisualState x:Name="Selected" />
-								<VisualState x:Name="SelectedUnfocused" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type ListBox}" />
-	<Style BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type ListBoxItem}" />
-	<Style x:Key="WD.GridViewScrollViewerStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollViewer}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<controls:SmallPanel>
-						<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_VerticalScrollBar" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{TemplateBinding VerticalOffset}" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.GridViewColumnHeaderGripper" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
-		<Setter Property="Width" Value="18" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Thumb}">
-					<Border Padding="{TemplateBinding Padding}" Background="Transparent">
-						<Rectangle Width="1" HorizontalAlignment="Center" Fill="{TemplateBinding Background}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultGridViewColumnHeader" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GridViewColumnHeader}">
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FontWeight" Value="ExtraBlack" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
-					<controls:SmallPanel>
-						<Border x:Name="HeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-							<ContentPresenter x:Name="HeaderContent" Margin="0,0,0,1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
-						</Border>
-						<Thumb x:Name="PART_HeaderGripper" Margin="0,0,-9,0" HorizontalAlignment="Right" Style="{StaticResource WD.GridViewColumnHeaderGripper}" />
-						<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>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultListView" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListView}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<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">
-						<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>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsGrouping" Value="True">
-							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultListViewItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListViewItem}">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0,0,0,1" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ListViewItem}">
-					<Border x:Name="Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<GridViewRowPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="False" />
-								<Condition Property="IsMouseOver" Value="True" />
-							</MultiTrigger.Conditions>
-							<Setter Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
-						</MultiTrigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultListViewItem}" TargetType="{x:Type ListViewItem}" />
-	<Style BasedOn="{StaticResource WD.DefaultGridViewColumnHeader}" TargetType="{x:Type GridViewColumnHeader}" />
-	<Style BasedOn="{StaticResource WD.DefaultListView}" TargetType="{x:Type ListView}" />
-	<Style x:Key="WD.DefaultProgressBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ProgressBar}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Height" Value="{StaticResource WD.RepeatButtonSize}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ProgressBar}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
-							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)">
-								<EasingDoubleKeyFrame KeyTime="0" Value="0.3" />
-								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.3" />
-								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.3" />
-							</DoubleAnimationUsingKeyFrames>
-							<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)">
-								<EasingPointKeyFrame EasingFunction="{StaticResource WD.SineEaseOut}" KeyTime="0" Value="-0.5,0.5" />
-								<EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
-								<EasingPointKeyFrame EasingFunction="{StaticResource WD.SineEaseOut}" KeyTime="0:0:2" Value="1.5,0.5" />
-							</PointAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
-							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
-							<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}" />
-							</Decorator>
-							<Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
-								<Rectangle.RenderTransform>
-									<ScaleTransform />
-								</Rectangle.RenderTransform>
-							</Rectangle>
-						</controls:SmallPanel>
-					</controls:WDBorder>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Orientation" Value="Vertical">
-							<Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
-							<Setter TargetName="PART_TemplateRoot" Property="LayoutTransform">
-								<Setter.Value>
-									<RotateTransform Angle="-90" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-						<Trigger Property="IsIndeterminate" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="IndeterminateStoryboard" Storyboard="{StaticResource IsIndeterminate}" />
-							</Trigger.EnterActions>
-							<Setter TargetName="PART_Indicator" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_Rectangle" Property="Visibility" Value="Visible" />
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="IndeterminateStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsStripe" Value="True">
-							<Setter Property="Foreground">
-								<Setter.Value>
-									<DrawingBrush Stretch="None" TileMode="Tile" Viewport="0,0,20,6" ViewportUnits="Absolute">
-										<DrawingBrush.Transform>
-											<TransformGroup>
-												<RotateTransform Angle="20" />
-												<TranslateTransform X="0" />
-											</TransformGroup>
-										</DrawingBrush.Transform>
-										<DrawingBrush.Drawing>
-											<GeometryDrawing>
-												<GeometryDrawing.Brush>
-													<LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-														<GradientStop Offset="0" Color="{DynamicResource WD.PrimaryNormalColor}" />
-														<GradientStop Offset="0.5" Color="{DynamicResource WD.PrimaryNormalColor}" />
-														<GradientStop Offset="0.5" Color="Transparent" />
-														<GradientStop Offset="1" Color="Transparent" />
-													</LinearGradientBrush>
-												</GeometryDrawing.Brush>
-												<GeometryDrawing.Geometry>
-													<RectangleGeometry Rect="0,0,20,6" />
-												</GeometryDrawing.Geometry>
-											</GeometryDrawing>
-										</DrawingBrush.Drawing>
-									</DrawingBrush>
-								</Setter.Value>
-							</Setter>
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="LoadedBeginStoryboard">
-									<Storyboard RepeatBehavior="Forever">
-										<DoubleAnimation Storyboard.TargetName="Indicator" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" From="0" To="21" Duration="00:00:0.45" />
-									</Storyboard>
-								</BeginStoryboard>
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultProgressBar}" TargetType="{x:Type ProgressBar}" />
-	<Style x:Key="WD.DefaultTreeView" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TreeView}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<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">
-							<ItemsPresenter />
-						</ScrollViewer>
-					</controls:WDBorder>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ExpandCollapseToggleStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="ToggleButton">
-					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<controls:SmallPanel Width="15" Height="13" Background="Transparent">
-							<Path x:Name="Expanded" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
-								<Path.Fill>
-									<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
-								</Path.Fill>
-								<Path.RenderTransform>
-									<RotateTransform />
-								</Path.RenderTransform>
-							</Path>
-						</controls:SmallPanel>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="CheckStates">
-								<VisualState x:Name="Checked">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="Expanded" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Unchecked">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="Expanded" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Indeterminate" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.TreeViewItemFocusVisual">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Border>
-						<Rectangle Margin="0,0,0,0" Opacity="0" Stroke="{DynamicResource WD.BlackSolidColorBrush}" StrokeDashArray="1 2" StrokeThickness="5" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultTreeViewItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TreeViewItem}">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="FocusVisualStyle" Value="{StaticResource WD.TreeViewItemFocusVisual}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type TreeViewItem}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="Auto" MinWidth="19" />
-							<ColumnDefinition Width="Auto" />
-							<ColumnDefinition Width="*" />
-						</Grid.ColumnDefinitions>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource WD.ExpandCollapseToggleStyle}" />
-						<Border x:Name="PART_Border" Grid.Column="1" Grid.ColumnSpan="2" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-							<ContentPresenter x:Name="PART_Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" />
-						</Border>
-						<Border x:Name="PART_ItemsHost" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" RenderTransformOrigin=".5,0">
-							<Border.RenderTransform>
-								<ScaleTransform ScaleY="0" />
-							</Border.RenderTransform>
-							<ItemsPresenter x:Name="ItemsHost" />
-						</Border>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="ExpansionStates">
-								<VisualState x:Name="Expanded">
-									<Storyboard>
-										<DoubleAnimation Storyboard.TargetName="PART_ItemsHost" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="Collapsed" />
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_Border" Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsExpanded" Value="False">
-							<Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="HasItems" Value="False">
-							<Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
-						</Trigger>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsSelected" Value="True" />
-								<Condition Property="IsSelectionActive" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</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}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="SizeToContent" Value="WidthAndHeight" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="ShowInTaskbar" Value="False" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="UseLayoutRounding" Value="True" />
-		<Setter Property="TextOptions.TextFormattingMode" Value="Display" />
-		<Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
-		<Setter Property="WindowStyle" Value="ToolWindow" />
-		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition />
-								<RowDefinition />
-								<RowDefinition />
-							</Grid.RowDefinitions>
-							<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}}">
-										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
-									</Button>
-								</DockPanel>
-							</controls:SmallPanel>
-							<controls:SmallPanel Grid.Row="1" Margin="20">
-								<DockPanel>
-									<Path x:Name="PART_Path" Width="25" Height="25" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
-									<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">
-								<UniformGrid Height="38" Rows="1">
-									<Button x:Name="PART_ButtonYes" Width="60" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
-									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
-								</UniformGrid>
-							</controls:SmallPanel>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
-	<Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
-		<Setter Property="Width" Value="40" />
-		<Setter Property="Height" Value="40" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:NormalLoading}">
-					<Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-						<controls:SmallPanel>
-							<controls:SmallPanel.Resources>
-								<Storyboard x:Key="StarStoryboard" RepeatBehavior="Forever">
-									<DoubleAnimation Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="360" Duration="0:0:1.0" />
-								</Storyboard>
-							</controls:SmallPanel.Resources>
-							<Ellipse Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Stroke="{DynamicResource WD.BaseSolidColorBrush}" StrokeDashArray="100,100" StrokeThickness="2" />
-							<Ellipse x:Name="PART_Ellipse" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" RenderTransformOrigin=".5,.5" Stretch="Uniform" Stroke="{DynamicResource WD.PrimaryPressedSolidColorBrush}" StrokeDashArray="{TemplateBinding StrokeArray}" StrokeThickness="2">
-								<Ellipse.RenderTransform>
-									<RotateTransform Angle="0" />
-								</Ellipse.RenderTransform>
-								<Ellipse.Triggers>
-									<EventTrigger RoutedEvent="Loaded">
-										<BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
-									</EventTrigger>
-									<EventTrigger RoutedEvent="Unloaded">
-										<StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
-									</EventTrigger>
-								</Ellipse.Triggers>
-							</Ellipse>
-						</controls:SmallPanel>
-					</Viewbox>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DefaultLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:DefaultLoading}">
-		<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.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)">
-								<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" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.999" Value="405" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:2.666" Value="540" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:3.333" Value="675" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:3.999" Value="810" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:4.666" Value="945" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:5.332" Value="1080" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(shapes:Arc.StartAngle)">
-								<SplineDoubleKeyFrame KeyTime="0" Value="-5" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:0.666" Value="-130" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.333" Value="-5" />
-							</DoubleAnimationUsingKeyFrames>
-							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(shapes:Arc.EndAngle)">
-								<SplineDoubleKeyFrame KeyTime="0" Value="5" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:0.666" Value="130" />
-								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.333" Value="5" />
-							</DoubleAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel x:Name="PART_SmallPanel" RenderTransformOrigin=".5,.5">
-						<controls:SmallPanel.RenderTransform>
-							<RotateTransform />
-						</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 />
-							</shapes:Arc.RenderTransform>
-						</shapes:Arc>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.NormalLoading}" TargetType="{x:Type controls:NormalLoading}" />
-	<Style BasedOn="{StaticResource WD.DefaultLoading}" TargetType="{x:Type controls:DefaultLoading}" />
-	<Style x:Key="WD.ThemeControl" TargetType="{x:Type controls:ThemeControl}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:ThemeControl}">
-					<ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:ThemeControl}}">
-						<ItemsControl.ItemTemplate>
-							<DataTemplate>
-								<RadioButton Width="40" Height="40" Margin="4,0" Cursor="Hand" IsChecked="{Binding IsChecked}">
-									<RadioButton.Style>
-										<Style TargetType="{x:Type RadioButton}">
-											<Setter Property="Template">
-												<Setter.Value>
-													<ControlTemplate TargetType="{x:Type RadioButton}">
-														<Border x:Name="PART_Border" Padding="2" BorderBrush="{Binding Color}" BorderThickness="0">
-															<controls:SmallPanel Background="{x:Null}">
-																<Rectangle x:Name="PART_Rectangle" Fill="{Binding Color}" />
-																<Path Width="12" Height="10" Margin="0,0,4,4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" Stretch="Fill" Visibility="{Binding IsChecked, Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-															</controls:SmallPanel>
-														</Border>
-														<ControlTemplate.Triggers>
-															<Trigger Property="IsMouseOver" Value="True">
-																<Setter TargetName="PART_Rectangle" Property="Opacity" Value=".8" />
-																<Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
-															</Trigger>
-															<Trigger Property="IsChecked" Value="True">
-																<Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
-															</Trigger>
-														</ControlTemplate.Triggers>
-													</ControlTemplate>
-												</Setter.Value>
-											</Setter>
-										</Style>
-									</RadioButton.Style>
-								</RadioButton>
-							</DataTemplate>
-						</ItemsControl.ItemTemplate>
-						<ItemsControl.ItemsPanel>
-							<ItemsPanelTemplate>
-								<WrapPanel />
-							</ItemsPanelTemplate>
-						</ItemsControl.ItemsPanel>
-					</ItemsControl>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.ThemeControl}" TargetType="{x:Type controls:ThemeControl}" />
-	<Style x:Key="WD.GridSplitterPreviewStyle">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Rectangle Fill="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Opacity=".6" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="DefaultGridSplitter" TargetType="{x:Type GridSplitter}">
-		<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="PreviewStyle" Value="{StaticResource WD.GridSplitterPreviewStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type GridSplitter}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
-	<Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Label}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultLabel}" TargetType="{x:Type Label}" />
-	<Style x:Key="WD.DefaultRepeatButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
-		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type RepeatButton}">
-					<controls:SmallPanel>
-						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsPressed" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsFocused" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseCaptured" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultRepeatButton}" TargetType="{x:Type RepeatButton}" />
-	<Style TargetType="{x:Type ec:PathListBox}" x:Key="{x:Type ec:PathListBox}">
-		<Setter Property="IsTabStop" Value="False" />
-		<Setter Property="FrameworkElement.UseLayoutRounding" Value="False" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<ec:PathPanel />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ec:PathListBox}">
-					<Grid>
-						<VisualStateManager.VisualStateGroups>
-							<VisualStateGroup x:Name="ValidationStates">
-								<VisualState x:Name="Valid" />
-								<VisualState x:Name="InvalidUnfocused">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<ObjectKeyFrame.Value>
-													<Visibility>Visible</Visibility>
-												</ObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-								<VisualState x:Name="InvalidFocused">
-									<Storyboard>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<ObjectKeyFrame.Value>
-													<Visibility>Visible</Visibility>
-												</ObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-										<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen" Storyboard.TargetName="validationTooltip">
-											<DiscreteObjectKeyFrame KeyTime="0">
-												<ObjectKeyFrame.Value>
-													<sys:Boolean>True</sys:Boolean>
-												</ObjectKeyFrame.Value>
-											</DiscreteObjectKeyFrame>
-										</ObjectAnimationUsingKeyFrames>
-									</Storyboard>
-								</VisualState>
-							</VisualStateGroup>
-						</VisualStateManager.VisualStateGroups>
-						<Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" CornerRadius="2">
-							<ItemsPresenter />
-						</Border>
-						<Border Name="ValidationErrorElement" BorderBrush="#FFDB000C" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" Visibility="Collapsed">
-							<ToolTipService.ToolTip>
-								<ToolTip Name="validationTooltip" Placement="Right" Template="{StaticResource ValidationToolTipTemplate}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}">
-									<FrameworkElement.Triggers>
-										<EventTrigger RoutedEvent="Canvas.Loaded">
-											<BeginStoryboard>
-												<Storyboard>
-													<ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="validationTooltip">
-														<DiscreteObjectKeyFrame KeyTime="0">
-															<ObjectKeyFrame.Value>
-																<sys:Boolean>true</sys:Boolean>
-															</ObjectKeyFrame.Value>
-														</DiscreteObjectKeyFrame>
-													</ObjectAnimationUsingKeyFrames>
-												</Storyboard>
-											</BeginStoryboard>
-										</EventTrigger>
-									</FrameworkElement.Triggers>
-								</ToolTip>
-							</ToolTipService.ToolTip>
-							<Grid Background="#00FFFFFF" HorizontalAlignment="Right" Height="10" Margin="0,-4,-4,0" VerticalAlignment="Top" Width="10">
-								<Path Data="M1,0 L6,0 A2,2 0 0 1 8,2L8,7" Fill="#FFDC000C" Margin="-1,3,0,0" />
-								<Path Data="M0,0 L2,0 L8,6 L8,8" Fill="#ffffff" Margin="-1,3,0,0" />
-							</Grid>
-						</Border>
-					</Grid>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.AnimationAudio" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:AnimationAudio}">
-		<Setter Property="Width" Value="80" />
-		<Setter Property="Height" Value="35" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="PlayStoryboard" RepeatBehavior="Forever">
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)">
-								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
-							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)">
-								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
-							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
-								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
-							</ObjectAnimationUsingKeyFrames>
-							<ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
-								<DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
-							</ObjectAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding helpers:ControlsHelper.CornerRadius}" SnapsToDevicePixels="True" UseLayoutRounding="True">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-							<StackPanel x:Name="PART_StackPanel" Width="20" Height="30" Margin="10,0" HorizontalAlignment="Left" Orientation="Horizontal" RenderTransformOrigin=".5,.5">
-								<Path Width="4" Height="6" Data="{StaticResource WD.AudioOneGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
-								<Path x:Name="PART_Path2" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
-								<Path x:Name="PART_Path3" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
-							</StackPanel>
-							<TextBlock x:Name="PART_TextBlock" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}">
+    <Geometry x:Key="WD.ChevronRightGeometry" po:Freeze="True">M678.4 512l-365.619-379.904c-13.722-13.824-13.722-36.198 0-50.125 13.722-13.824 35.891-13.824 49.613 0l400.896 404.89c13.722 13.875 13.722 36.301 0 50.125l-400.896 404.89c-13.722 13.875-35.891 13.824-49.613 0-13.722-13.773-13.722-36.198 0-50.125l365.619-379.75z</Geometry>
+    <Geometry x:Key="WD.SortArrowGeometry" po:Freeze="True">M854 512l-342 342-342-342 62-60 238 238v-520h84v520l240-238z</Geometry>
+    <Geometry x:Key="WD.WindowMaximizeGeometry" po:Freeze="True">M0.99999994,0.99999994 L0.99999994,9 9,9 9,0.99999994 z M0,0 L10,0 10,10 0,10 z</Geometry>
+    <Geometry x:Key="WD.WindowRestoreGeometry" po:Freeze="True">M1,3 L1,9 7,9 7,3 z M3,0.99999994 L3,2 8,2 8,7 9,7 9,0.99999994 z M2,0 L10,0 10,8 8,8 8,10 0,10 0,2 2,2 z</Geometry>
+    <Geometry x:Key="WD.WindowCloseGeometry" po:Freeze="True">M 1301 69.6875 L 1305.3049 74 L 1300.9375 78.5313 L 1301.6324 79.2263 L 1306 74.735 L 1310.4263 79.2613 L 1311.1563 78.5313 L 1306.7 74 L 1310.9375 69.6875 L 1310.2075 68.9575 L 1306 73.265 L 1301.6949 68.9925 L 1301 69.6875 Z</Geometry>
+    <Geometry x:Key="WD.InformationGeometry" po:Freeze="True">M426 726l384-384-60-62-324 324-152-152-60 60zM512 86c236 0 426 190 426 426s-190 426-426 426-426-190-426-426 190-426 426-426z</Geometry>
+    <Geometry x:Key="WD.WarningGeometry" po:Freeze="True">M512 960c-281.6 0-512-230.4-512-512s230.4-512 512-512 512 230.4 512 512-230.4 512-512 512zM576 128h-128v448h128v-448zM576 640h-128v128h128v-128z</Geometry>
+    <Geometry x:Key="WD.QuestionGeometry" po:Freeze="True">M10 20a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm2-13c0 .28-.21.8-.42 1L10 9.58c-.57.58-1 1.6-1 2.42v1h2v-1c0-.29.21-.8.42-1L13 9.42c.57-.58 1-1.6 1-2.42a4 4 0 1 0-8 0h2a2 2 0 1 1 4 0zm-3 8v2h2v-2H9z</Geometry>
+    <Geometry x:Key="WD.ErrorGeometry" po:Freeze="True">M264 456Q210 456 164 429 118 402 91 356 64 310 64 256 64 202 91 156 118 110 164 83 210 56 264 56 318 56 364 83 410 110 437 156 464 202 464 256 464 310 437 356 410 402 364 429 318 456 264 456ZM264 288L328 352 360 320 296 256 360 192 328 160 264 224 200 160 168 192 232 256 168 320 200 352 264 288Z</Geometry>
+    <Geometry x:Key="WD.SmileyOutlineGeometry" po:Freeze="True">M14.36,14.23a3.76,3.76,0,0,1-4.72,0,1,1,0,0,0-1.28,1.54,5.68,5.68,0,0,0,7.28,0,1,1,0,1,0-1.28-1.54ZM9,11a1,1,0,1,0-1-1A1,1,0,0,0,9,11Zm6-2a1,1,0,1,0,1,1A1,1,0,0,0,15,9ZM12,2A10,10,0,1,0,22,12,10,10,0,0,0,12,2Zm0,18a8,8,0,1,1,8-8A8,8,0,0,1,12,20Z</Geometry>
+    <Geometry x:Key="WD.BusGeometry" po:Freeze="True">M18,11H6V6H18M16.5,17A1.5,1.5 0 0,1 15,15.5A1.5,1.5 0 0,1 16.5,14A1.5,1.5 0 0,1 18,15.5A1.5,1.5 0 0,1 16.5,17M7.5,17A1.5,1.5 0 0,1 6,15.5A1.5,1.5 0 0,1 7.5,14A1.5,1.5 0 0,1 9,15.5A1.5,1.5 0 0,1 7.5,17M4,16C4,16.88 4.39,17.67 5,18.22V20A1,1 0 0,0 6,21H7A1,1 0 0,0 8,20V19H16V20A1,1 0 0,0 17,21H18A1,1 0 0,0 19,20V18.22C19.61,17.67 20,16.88 20,16V6C20,2.5 16.42,2 12,2C7.58,2 4,2.5 4,6V16Z</Geometry>
+    <Geometry x:Key="WD.FriendGeometry" po:Freeze="True">M12.3,12.22A4.92,4.92,0,0,0,14,8.5a5,5,0,0,0-10,0,4.92,4.92,0,0,0,1.7,3.72A8,8,0,0,0,1,19.5a1,1,0,0,0,2,0,6,6,0,0,1,12,0,1,1,0,0,0,2,0A8,8,0,0,0,12.3,12.22ZM9,11.5a3,3,0,1,1,3-3A3,3,0,0,1,9,11.5Zm9.74.32A5,5,0,0,0,15,3.5a1,1,0,0,0,0,2,3,3,0,0,1,3,3,3,3,0,0,1-1.5,2.59,1,1,0,0,0-.5.84,1,1,0,0,0,.45.86l.39.26.13.07a7,7,0,0,1,4,6.38,1,1,0,0,0,2,0A9,9,0,0,0,18.74,11.82Z</Geometry>
+    <Geometry x:Key="WD.BuildingRegularGeometry" po:Freeze="True">M128 148v-40c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12h-40c-6.6 0-12-5.4-12-12zm140 12h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm-128 96h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm128 0h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm-76 84v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12zm76 12h40c6.6 0 12-5.4 12-12v-40c0-6.6-5.4-12-12-12h-40c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12zm180 124v36H0v-36c0-6.6 5.4-12 12-12h19.5V24c0-13.3 10.7-24 24-24h337c13.3 0 24 10.7 24 24v440H436c6.6 0 12 5.4 12 12zM79.5 463H192v-67c0-6.6 5.4-12 12-12h40c6.6 0 12 5.4 12 12v67h112.5V49L80 48l-.5 415z</Geometry>
+    <Geometry x:Key="WD.AlarmClockGeometry" po:Freeze="True">M470 124.837l-98.443-81.78-27.814 32.931 98.442 81.769L470 124.837zM167.192 74.919L139.366 42 42 124.837l27.814 32.919 97.378-82.837zm99.509 97.709H234.6v127.446l101.649 60.539L352.3 334.06l-85.6-49.917V172.628zM256 87.665c-107 0-192.601 86.021-192.601 191.166C63.399 383.98 149 470 256 470c105.936 0 192.601-86.02 192.601-191.169 0-105.144-86.665-191.166-192.601-191.166zm0 339.855c-82.393 0-149.8-66.906-149.8-148.688 0-81.777 67.407-148.684 149.8-148.684 82.394 0 149.8 66.906 149.8 148.684 0 82.839-67.406 148.688-149.8 148.688z</Geometry>
+    <Geometry x:Key="WD.FlagGeometry" po:Freeze="True">M687.5 125C500 125 375 13.7 187.5 62.5V31.3C187.5 31.3 187.5 0 156.3 0C125 0 125 31.3 125 31.3V1000H187.5V625C375 562.5 500 687.5 687.5 687.5C875 687.5 937.5 625 937.5 625V62.5C937.5 62.5 875 125 687.5 125Z</Geometry>
+    <Geometry x:Key="WD.CircularGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
+    <Geometry x:Key="WD.AddGeometry" po:Freeze="True">M810 554h-256v256h-84v-256h-256v-84h256v-256h84v256h256v84z</Geometry>
+    <Geometry x:Key="WD.ChatLeftGeometry" po:Freeze="True">M365.714 256v512q0 14.857-10.857 25.714t-25.714 10.857-25.714-10.857l-256-256q-10.857-10.857-10.857-25.714t10.857-25.714l256-256q10.857-10.857 25.714-10.857t25.714 10.857 10.857 25.714z</Geometry>
+    <Geometry x:Key="WD.ChatRightGeometry" po:Freeze="True">M329.143 512q0 14.857-10.857 25.714l-256 256q-10.857 10.857-25.714 10.857t-25.714-10.857-10.857-25.714v-512q0-14.857 10.857-25.714t25.714-10.857 25.714 10.857l256 256q10.857 10.857 10.857 25.714z</Geometry>
+    <Geometry x:Key="WD.StarGeometry" po:Freeze="True">M649.714 573.714l174.857-169.714-241.143-35.429-108-218.286-108 218.286-241.143 35.429 174.857 169.714-41.714 240.571 216-113.714 215.429 113.714zM950.857 369.714q0 12.571-14.857 27.429l-207.429 202.286 49.143 285.714q0.571 4 0.571 11.429 0 28.571-23.429 28.571-10.857 0-22.857-6.857l-256.571-134.857-256.571 134.857q-12.571 6.857-22.857 6.857-12 0-18-8.286t-6-20.286q0-3.429 1.143-11.429l49.143-285.714-208-202.286q-14.286-15.429-14.286-27.429 0-21.143 32-26.286l286.857-41.714 128.571-260q10.857-23.429 28-23.429t28 23.429l128.571 260 286.857 41.714q32 5.143 32 26.286z</Geometry>
+    <Geometry x:Key="WD.CompleteGeometry" po:Freeze="True">M384 690l452-452 60 60-512 512-238-238 60-60z</Geometry>
+    <Geometry x:Key="WD.CancelGeometry" po:Freeze="True">M810.667 170.667q18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-268.667 268.333 268.667 268.333q12.333 12.333 12.333 30.333 0 18.333-12.167 30.5t-30.5 12.167q-18 0-30.333-12.333l-268.333-268.667-268.333 268.667q-12.333 12.333-30.333 12.333-18.333 0-30.5-12.167t-12.167-30.5q0-18 12.333-30.333l268.667-268.333-268.667-268.333q-12.333-12.333-12.333-30.333 0-18.333 12.167-30.5t30.5-12.167q18 0 30.333 12.333l268.333 268.667 268.333-268.667q12.333-12.333 30.333-12.333z</Geometry>
+    <Geometry x:Key="WD.SaveGeometry" po:Freeze="True">M512 42.667q17.667 0 30.167 12.5t12.5 30.167v494.333l140.333-140.667q12.333-12.333 30.333-12.333 18.333 0 30.5 12.167t12.167 30.5q0 18-12.333 30.333l-213.333 213.333q-12.333 12.333-30.333 12.333t-30.333-12.333l-213.333-213.333q-12.333-13-12.333-30.333 0-17.667 12.5-30.167t30.167-12.5q18 0 30.333 12.333l140.333 140.667v-494.333q0-17.667 12.5-30.167t30.167-12.5zM938.667 640q17.667 0 30.167 12.5t12.5 30.167v170.667q0 53.333-37 90.333-37.667 37.667-90 37.667h-683.667q-52.333 0-90.667-37.333-37.333-38.333-37.333-90.667v-170.667q0-17.667 12.5-30.167t30.167-12.5 30.167 12.5 12.5 30.167v170.667q0 17.667 12.5 30.167t30.167 12.5h683.667q17.333 0 29.5-12.5t12.167-30.167v-170.667q0-17.667 12.5-30.167t30.167-12.5z</Geometry>
+    <Geometry x:Key="WD.MenuGeometry" po:Freeze="True">M2,15.5L22,15.5 22,17.5 2,17.5 2,15.5z M2,10.5L22,10.5 22,12.5 2,12.5 2,10.5z M2,5.5L22,5.5 22,7.5 2,7.5 2,5.5z</Geometry>
+    <Geometry x:Key="WD.SectorGeometry" po:Freeze="True">M 200,200 0,200 A 200,200 0 0 1 58.6,58.6z</Geometry>
+    <Geometry x:Key="WD.ReplaceGeometry" po:Freeze="True">M282.419 728.269c-115.814-124.518-113.766-319.693 6.554-440.883 49.254-49.613 110.797-79.206 174.797-88.883l-3.533-106.342c-89.856 10.906-176.742 50.995-245.606 120.371-161.229 162.304-163.174 424.397-6.298 590.387l-89.139 89.702 282.112 15.411-0.768-298.701-118.118 118.938zM622.746 115.968l0.768 298.701 118.118-118.886c115.814 124.621 113.766 319.795-6.554 440.883-49.203 49.613-110.797 79.206-174.797 88.883l3.533 106.291c89.856-10.906 176.742-50.995 245.658-120.32 161.178-162.406 163.123-424.499 6.246-590.387l89.139-89.805-282.112-15.36z</Geometry>
+    <Geometry x:Key="WD.AudioOneGeometry" po:Freeze="True">M344.96 362.647l-146.526 150.83L347.89 664.314c79.122-82.808 79.122-218.856-2.93-301.667z</Geometry>
+    <Geometry x:Key="WD.AudioTwoGeometry" po:Freeze="True">M494.413 214.765l-73.263 73.941c123.083 124.215 123.083 325.328 0 449.546l73.263 73.938c164.11-165.625 164.11-431.797 0-597.425z</Geometry>
+    <Geometry x:Key="WD.AudioThreeGeometry" po:Freeze="True">M640.944 63.934l-73.266 73.941c205.138 207.023 205.138 541.221 0 748.256l73.266 73.935c246.163-245.478 246.163-647.699 0-896.132z</Geometry>
+    <Geometry x:Key="WD.RectangleGeometry" po:Freeze="True">M640 146.286h-475.429q-37.714 0-64.571 26.857t-26.857 64.571v475.429q0 37.714 26.857 64.571t64.571 26.857h475.429q37.714 0 64.571-26.857t26.857-64.571v-475.429q0-37.714-26.857-64.571t-64.571-26.857zM804.571 237.714v475.429q0 68-48.286 116.286t-116.286 48.286h-475.429q-68 0-116.286-48.286t-48.286-116.286v-475.429q0-68 48.286-116.286t116.286-48.286h475.429q68 0 116.286 48.286t48.286 116.286z</Geometry>
+    <Geometry x:Key="WD.EllipseGeometry" po:Freeze="True">M438.857 201.143q-84.571 0-156 41.714t-113.143 113.143-41.714 156 41.714 156 113.143 113.143 156 41.714 156-41.714 113.143-113.143 41.714-156-41.714-156-113.143-113.143-156-41.714zM877.714 512q0 119.429-58.857 220.286t-159.714 159.714-220.286 58.857-220.286-58.857-159.714-159.714-58.857-220.286 58.857-220.286 159.714-159.714 220.286-58.857 220.286 58.857 159.714 159.714 58.857 220.286z</Geometry>
+    <Geometry x:Key="WD.UpperTriangleGeometry" po:Freeze="True">M768 716.8h-512l256-460.8 256 460.8z</Geometry>
+    <Geometry x:Key="WD.ArrowGeometry" po:Freeze="True">M2.8421711E-14,30 L30,15 2.8421711E-14,3.5527137E-15 5.3751788,15 z</Geometry>
+    <Geometry x:Key="WD.ArrowRightTopGeometry" po:Freeze="True">M384 214h426v426h-84v-282l-496 496-60-60 496-496h-282v-84z</Geometry>
+    <Geometry x:Key="WD.ArrowBranchesGeometry" po:Freeze="True">M458.361,207.01328 L574.12778,224.42874 574,184 458.361,204.52536</Geometry>
+    <Geometry x:Key="WD.TextGeometry" po:Freeze="True">M8.394,7.3850001 L18,7.3850001 18,8.9495381 14.071471,8.9495381 14.071471,21 12.304952,21 12.304952,8.9495381 8.394,8.9495381 z M5.2364039,2.4000326 C4.4364113,2.4000326 3.7515685,2.6937805 3.1818757,3.2812766 2.612183,3.8687721 2.3273365,4.5750159 2.3273365,5.4000081 L2.3273365,20.999992 C2.3273365,21.824983 2.612183,22.531227 3.1818757,23.118723 3.7515685,23.706219 4.4364113,23.999966 5.2364039,23.999966 L20.363661,23.999966 C21.163652,23.999966 21.848495,23.706219 22.418188,23.118723 22.987883,22.531227 23.272728,21.824983 23.272728,20.999992 L23.272728,5.4000081 C23.272728,4.5750159 22.987883,3.8687721 22.418188,3.2812766 21.848495,2.6937805 21.163652,2.4000326 20.363661,2.4000326 z M5.2363719,0 L20.36363,0 C21.806051,0 23.039387,0.52812719 24.063631,1.5843812 25.087877,2.6406356 25.6,3.912511 25.6,5.4000081 L25.6,20.999992 C25.6,22.487488 25.087877,23.759365 24.063631,24.815618 23.039387,25.871874 21.806051,26.399999 20.36363,26.399999 L5.2363719,26.399999 C3.7939503,26.399999 2.5606164,25.871874 1.5363699,24.815618 0.51212323,23.759365 -5.3697355E-08,22.487488 3.5527137E-15,20.999992 L3.5527137E-15,5.4000081 C-5.3697355E-08,3.912511 0.51212323,2.6406356 1.5363699,1.5843812 2.5606164,0.52812719 3.7939503,0 5.2363719,0 z</Geometry>
+    <Geometry x:Key="WD.InkGeometry" po:Freeze="True">M986.466 37.502c-49.982-49.982-131.004-49.982-180.986 0l-483.984 484.144c43.262 11.264 83.262 32.99 115.74 65.502 32.99 32.99 54.014 73.246 65.246 115.484l483.984-484.144c50.014-49.982 50.014-131.002 0-180.986zM346.742 858.63c49.982-49.982 49.982-131.004 0-180.986s-131.004-49.982-180.986 0l-165.756 346.356 346.742-165.37z</Geometry>
+    <Geometry x:Key="WD.StarSkyGeometry" po:Freeze="True">M16.001007,0L20.944,10.533997 32,12.223022 23.998993,20.421997 25.889008,32 16.001007,26.533997 6.1109924,32 8,20.421997 0,12.223022 11.057007,10.533997z</Geometry>
+    <Geometry x:Key="WD.ReturnGeometry" po:Freeze="True">M356.667 155q17.333 0 30 12.5t12.667 30.167-12.667 30.333l-198.667 198.667h409.333q78 0 149.167 30.333t122.5 81.833 81.833 122.5 30.5 149.333v42.667q0 17.667-12.5 30.167t-30.167 12.5q-17.333 0-30-12.667t-12.667-30v-42.667q0-60.667-23.667-116t-63.667-95.333-95.333-63.667-116-23.667h-409.333l198.667 199q12.667 12.667 12.667 30 0 17.667-12.5 30.333t-30.167 12.667-30.333-12.667l-271.333-271.667q-12.333-12.333-12.333-30.333 0-17.667 12.333-30l271.333-271.667q12.667-12.667 30.333-12.667z</Geometry>
+    <Geometry x:Key="WD.HomeGeometry" po:Freeze="True">M804.571 566.857v274.286q0 14.857-10.857 25.714t-25.714 10.857h-219.429v-219.429h-146.286v219.429h-219.429q-14.857 0-25.714-10.857t-10.857-25.714v-274.286q0-0.571 0.286-1.714t0.286-1.714l328.571-270.857 328.571 270.857q0.571 1.143 0.571 3.429zM932 527.429l-35.429 42.286q-4.571 5.143-12 6.286h-1.714q-7.429 0-12-4l-395.429-329.714-395.429 329.714q-6.857 4.571-13.714 4-7.429-1.143-12-6.286l-35.429-42.286q-4.571-5.714-4-13.429t6.286-12.286l410.857-342.286q18.286-14.857 43.429-14.857t43.429 14.857l139.429 116.571v-111.429q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143v233.143l125.143 104q5.714 4.571 6.286 12.286t-4 13.429z</Geometry>
+    <Geometry x:Key="WD.ChevronUpGeometry" po:Freeze="True">M336.998 621.619c-13.875 13.722-36.301 13.722-50.074 0s-13.926-35.891 0-49.613l200.090-196.096c13.824-13.722 36.198-13.722 50.125 0l200.090 196.096c13.824 13.67 13.824 35.891 0 49.613-13.875 13.722-36.301 13.722-50.125 0l-175.104-160.819-175.002 160.819z</Geometry>
+    <Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
+    <Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
+    <CubicEase x:Key="WD.CubicEaseInOut" EasingMode="EaseInOut" />
+    <PowerEase x:Key="WD.PowerEaseInOut" EasingMode="EaseInOut" />
+    <ExponentialEase x:Key="WD.ExponentialEaseOut" EasingMode="EaseOut" />
+    <SineEase x:Key="WD.SineEaseOut" EasingMode="EaseOut" />
+    <SineEase x:Key="WD.SineEaseInOut" EasingMode="EaseInOut" />
+    <BackEase x:Key="WD.BackEaseEaseInOut" EasingMode="EaseInOut" />
+    <sys:Double x:Key="WD.EnabledOpacity">0.7</sys:Double>
+    <sys:Double x:Key="WD.DefaultCornerRadius">4</sys:Double>
+    <sys:Double x:Key="WD.DefaultHeight">32</sys:Double>
+    <sys:Double x:Key="WD.ThumbWidth">16</sys:Double>
+    <sys:Double x:Key="WD.ThumbCornerRadius">8</sys:Double>
+    <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" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="{x:Null}">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+            <DataTrigger Binding="{Binding Content, RelativeSource={RelativeSource Self}}" Value="">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+    <converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
+    <converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
+    <converts: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" />
+    <ec:IsArrangedToScaleConverter x:Key="IsArrangedToScaleConverter" />
+    <ControlTemplate x:Key="ValidationToolTipTemplate">
+        <Grid Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
+            <UIElement.RenderTransform>
+                <TranslateTransform x:Name="xform" X="-25" />
+            </UIElement.RenderTransform>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="OpenStates">
+                    <VisualStateGroup.Transitions>
+                        <VisualTransition GeneratedDuration="0" />
+                        <VisualTransition GeneratedDuration="0:0:0.2" To="Open">
+                            <Storyboard>
+                                <DoubleAnimation Duration="0:0:0.2" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform">
+                                    <DoubleAnimation.EasingFunction>
+                                        <BackEase Amplitude=".3" EasingMode="EaseOut" />
+                                    </DoubleAnimation.EasingFunction>
+                                </DoubleAnimation>
+                                <DoubleAnimation Duration="0:0:0.2" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
+                            </Storyboard>
+                        </VisualTransition>
+                    </VisualStateGroup.Transitions>
+                    <VisualState x:Name="Closed">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Open">
+                        <Storyboard>
+                            <DoubleAnimation Duration="0" To="0" Storyboard.TargetProperty="X" Storyboard.TargetName="xform" />
+                            <DoubleAnimation Duration="0" To="1" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="Root" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <Border Background="#052A2E31" CornerRadius="5" Margin="4,4,-4,-4" />
+            <Border Background="#152A2E31" CornerRadius="4" Margin="3,3,-3,-3" />
+            <Border Background="#252A2E31" CornerRadius="3" Margin="2,2,-2,-2" />
+            <Border Background="#352A2E31" CornerRadius="2" Margin="1,1,-1,-1" />
+            <Border Background="#FFDC000C" CornerRadius="2" />
+            <Border CornerRadius="2">
+                <TextBlock Foreground="#FFFFFFFF" MaxWidth="250" Margin="8,4,8,4" TextWrapping="Wrap" UseLayoutRounding="False" Text="{Binding (Validation.Errors)[0].ErrorContent}" />
+            </Border>
+        </Grid>
+    </ControlTemplate>
+    <Style TargetType="{x:Type ec:PathListBoxItem}" x:Key="{x:Type ec:PathListBoxItem}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="Background" Value="#00FFFFFF" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ec:PathListBoxItem}">
+                    <Grid Background="{TemplateBinding Background}" RenderTransformOrigin="0.5,0.5">
+                        <UIElement.RenderTransform>
+                            <TransformGroup>
+                                <ScaleTransform ScaleX="{Binding IsArranged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsArrangedToScaleConverter}}" ScaleY="{Binding IsArranged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource IsArrangedToScaleConverter}}" />
+                                <SkewTransform />
+                                <RotateTransform Angle="{Binding OrientationAngle, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <TranslateTransform />
+                            </TransformGroup>
+                        </UIElement.RenderTransform>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To=".35" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="fillColor" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To=".55" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="contentPresenter" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <DoubleAnimation Duration="0" To=".75" Storyboard.TargetProperty="Opacity" Storyboard.TargetName="fillColor2" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Duration="0" Storyboard.TargetProperty="Visibility" Storyboard.TargetName="FocusVisualElement">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <ObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </ObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unfocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Rectangle Name="fillColor" Fill="#FFBADDE9" IsHitTestVisible="False" Opacity="0" RadiusY="1" RadiusX="1" />
+                        <Rectangle Name="fillColor2" Fill="#FFBADDE9" IsHitTestVisible="False" Opacity="0" RadiusY="1" RadiusX="1" />
+                        <ContentPresenter Name="contentPresenter" ContentTemplate="{TemplateBinding ContentTemplate}" Content="{TemplateBinding Content}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" />
+                        <Rectangle Name="FocusVisualElement" RadiusY="1" RadiusX="1" Stroke="#FF6DBDD1" StrokeThickness="1" Visibility="Collapsed" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type drawingControls:Callout}" x:Key="{x:Type drawingControls:Callout}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type drawingControls:Callout}">
+                    <Grid>
+                        <Path Name="PART_Path" Fill="{TemplateBinding Fill}" Stroke="{TemplateBinding Stroke}" StrokeThickness="{TemplateBinding StrokeThickness}" StrokeDashArray="{TemplateBinding StrokeDashArray}" StrokeDashCap="{TemplateBinding StrokeDashCap}" StrokeDashOffset="{TemplateBinding StrokeDashOffset}" StrokeLineJoin="{TemplateBinding StrokeLineJoin}" StrokeMiterLimit="{TemplateBinding StrokeMiterLimit}" StrokeStartLineCap="{TemplateBinding StrokeStartLineCap}" StrokeEndLineCap="{TemplateBinding StrokeEndLineCap}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="Fill" UseLayoutRounding="False" />
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding InternalContent}" Margin="{TemplateBinding Padding}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style TargetType="{x:Type drawingControls:LineArrow}" x:Key="{x:Type drawingControls:LineArrow}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type drawingControls:LineArrow}">
+                    <Path Name="PART_Path" Fill="{TemplateBinding Stroke}" Stroke="{TemplateBinding Stroke}" StrokeThickness="{TemplateBinding StrokeThickness}" StrokeDashArray="{TemplateBinding StrokeDashArray}" StrokeDashCap="{TemplateBinding StrokeDashCap}" StrokeDashOffset="{TemplateBinding StrokeDashOffset}" StrokeLineJoin="{TemplateBinding StrokeLineJoin}" StrokeMiterLimit="{TemplateBinding StrokeMiterLimit}" StrokeStartLineCap="{TemplateBinding StrokeStartLineCap}" StrokeEndLineCap="{TemplateBinding StrokeEndLineCap}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Stretch="Fill" UseLayoutRounding="False" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="WD.LampEffectStreamer" TargetType="{x:Type controls:BreathLamp}">
+        <controls:SmallPanel>
+            <Viewbox>
+                <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                    <Border x:Name="PART_LampContainer" Background="Transparent" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.BorderBrush>
+                            <LinearGradientBrush>
+                                <LinearGradientBrush.GradientStops>
+                                    <GradientStop Offset="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=GradientStopColor1}" />
+                                    <GradientStop Offset="0.3" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=GradientStopColor2}" />
+                                    <GradientStop Offset="1" Color="Transparent" />
+                                </LinearGradientBrush.GradientStops>
+                            </LinearGradientBrush>
+                        </Border.BorderBrush>
+                    </Border>
+                </controls:SmallPanel>
+            </Viewbox>
+            <Border Padding="{TemplateBinding BorderThickness}">
+                <ContentPresenter Margin="{TemplateBinding BorderThickness}" />
+            </Border>
+        </controls:SmallPanel>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsLampStart" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard x:Name="PART_LampStoryboard">
+                        <Storyboard RepeatBehavior="Forever">
+                            <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_LampContainer" Storyboard.TargetProperty="(Border.BorderBrush).(LinearGradientBrush.StartPoint)">
+                                <EasingPointKeyFrame KeyTime="0:0:0.0" Value="0,1" />
+                                <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
+                                <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
+                                <EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
+                                <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
+                            </PointAnimationUsingKeyFrames>
+                            <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_LampContainer" Storyboard.TargetProperty="(Border.BorderBrush).(LinearGradientBrush.EndPoint)">
+                                <EasingPointKeyFrame KeyTime="0:0:0.0" Value="0,1" />
+                                <EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
+                                <EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
+                                <EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
+                                <EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
+                            </PointAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <StopStoryboard BeginStoryboardName="PART_LampStoryboard" />
+                </Trigger.ExitActions>
+            </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" />
+    <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" />
+    <LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
+        <GradientStop Color="#FF0000" />
+        <GradientStop Offset="0.167" Color="#FF00FF" />
+        <GradientStop Offset="0.334" Color="#0000FF" />
+        <GradientStop Offset="0.501" Color="#00FFFF" />
+        <GradientStop Offset="0.668" Color="#00FF00" />
+        <GradientStop Offset="0.835" Color="#FFFF00" />
+        <GradientStop Offset="1" Color="#FF0000" />
+    </LinearGradientBrush>
+    <ControlTemplate x:Key="WD.ColorPickerSliderThumbTemplate" TargetType="Thumb">
+        <Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="Transparent" BorderBrush="White" BorderThickness="3" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+    </ControlTemplate>
+    <Style x:Key="WD.ColorPickerSliderRepeatButtonBaseStyle" TargetType="RepeatButton">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <SolidColorBrush x:Key="WD.SecondaryTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PrimaryTextColor}" />
+    <SolidColorBrush x:Key="WD.PlaceholderTextSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.PlaceholderTextColor}" />
+    <SolidColorBrush x:Key="WD.NormalSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.NormalColor}" />
+    <SolidColorBrush x:Key="WD.SuccessBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessBorderBrushColor}" />
+    <SolidColorBrush x:Key="WD.SuccessBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessBackgroundColor}" />
+    <SolidColorBrush x:Key="WD.SuccessSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessColor}" />
+    <SolidColorBrush x:Key="WD.SuccessMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessMouseOverColor}" />
+    <SolidColorBrush x:Key="WD.SuccessPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.SuccessPressedColor}" />
+    <SolidColorBrush x:Key="WD.WarningBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningBorderBrushColor}" />
+    <SolidColorBrush x:Key="WD.WarningBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningBackgroundColor}" />
+    <SolidColorBrush x:Key="WD.WarningSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningColor}" />
+    <SolidColorBrush x:Key="WD.WarningMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningMouseOverColor}" />
+    <SolidColorBrush x:Key="WD.WarningPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.WarningPressedColor}" />
+    <SolidColorBrush x:Key="WD.DangerBorderBrushSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerBorderBrushColor}" />
+    <SolidColorBrush x:Key="WD.DangerBackgroundSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerBackgroundColor}" />
+    <SolidColorBrush x:Key="WD.DangerSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerColor}" />
+    <SolidColorBrush x:Key="WD.DangerMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerMouseOverColor}" />
+    <SolidColorBrush x:Key="WD.DangerPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.DangerPressedColor}" />
+    <SolidColorBrush x:Key="WD.InfoSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoColor}" />
+    <SolidColorBrush x:Key="WD.InfoMouseOverSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoMouseOverColor}" />
+    <SolidColorBrush x:Key="WD.InfoPressedSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.InfoPressedColor}" />
+    <SolidColorBrush x:Key="WD.ExtralightSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.ExtralightColor}" />
+    <SolidColorBrush x:Key="WD.BlackSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.BlackColor}" />
+    <SolidColorBrush x:Key="WD.CircularSingularSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.CircularSingularColor}" />
+    <SolidColorBrush x:Key="WD.CircularDualSolidColorBrush" po:Freeze="True" Color="{StaticResource WD.CircularDualColor}" />
+    <Style x:Key="WD.ControlBasicStyle" TargetType="Control">
+        <Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
+        <Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
+        <Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
+        <Setter Property="FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
+        <Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
+        <Setter Property="TextElement.FontSize" Value="{StaticResource WD.NormalFontSize}" />
+        <Setter Property="TextElement.FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
+        <Setter Property="TextElement.FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
+        <Setter Property="TextElement.FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
+        <Setter Property="TextElement.FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
+        <Setter Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="TextBlock.FontSize" Value="{StaticResource WD.NormalFontSize}" />
+        <Setter Property="TextBlock.FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
+        <Setter Property="TextBlock.FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
+        <Setter Property="TextBlock.FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
+        <Setter Property="TextBlock.FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
+        <Setter Property="TextBlock.Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+                <Setter Property="Opacity" Value="{StaticResource WD.EnabledOpacity}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <DropShadowEffect x:Key="WD.NormalShadowDepth" BlurRadius="5" Direction="270" Opacity=".42" RenderingBias="Performance" ShadowDepth="1" Color="{StaticResource WD.ShadowDepthColor}" />
+    <DropShadowEffect x:Key="WD.PopupShadowDepth" BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{StaticResource WD.BlackColor}" />
+    <Style x:Key="WD.BaseButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ButtonBase}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <!--<Setter Property="helpers:ElementHelper.CornerRadius" Value="3" />-->
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+    </Style>
+    <Style x:Key="WD.NormalButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <controls:SmallPanel>
+                        <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Opacity=".4" SnapsToDevicePixels="True" />
+                        <ContentPresenter Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="UIElement.IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.ButtonFocusVisualColor}" />
+                        </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsRound" Value="True">
+                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+                            <Setter TargetName="PART_Border" Property="Width">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
+                                        <Binding ElementName="PART_Border" Path="ActualWidth" />
+                                        <Binding ElementName="PART_Border" Path="ActualHeight" />
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.PrimaryButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <controls:SmallPanel>
+                        <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsRound" Value="True">
+                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+                            <Setter TargetName="PART_Border" Property="Width">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
+                                        <Binding ElementName="PART_Border" Path="ActualWidth" />
+                                        <Binding ElementName="PART_Border" Path="ActualHeight" />
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <controls:SmallPanel>
+                        <Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBackgroundPressedSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.DefaultBackgroundPressedSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsRound" Value="True">
+                            <Setter Property="Padding" Value="0" />
+                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" />
+                            <Setter TargetName="PART_Border" Property="Width">
+                                <Setter.Value>
+                                    <MultiBinding Converter="{StaticResource WD.WidthHeightEqualValueConverter}">
+                                        <Binding ElementName="PART_Border" Path="ActualWidth" />
+                                        <Binding ElementName="PART_Border" Path="ActualHeight" />
+                                    </MultiBinding>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter TargetName="PART_Border" Property="Height" Value="{Binding Width, RelativeSource={RelativeSource Self}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.SuccessPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessMouseOverSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.SuccessDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.SuccessPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.SuccessBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.SuccessBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.SuccessSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.WarningPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.WarningSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.WarningMouseOverSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.WarningDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.WarningBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.WarningSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.WarningPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.WarningBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.WarningBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.WarningSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.DangerPrimaryButton" BasedOn="{StaticResource WD.PrimaryButton}" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.DangerSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.DangerMouseOverSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.DangerDefaultButton" BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.DangerBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.DangerSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.DangerPressedSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.DangerBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.DangerBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.DangerSolidColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.PathButton" BasedOn="{StaticResource WD.BaseButton}" TargetType="{x:Type Button}">
+        <Setter Property="Padding" Value="8" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Background="Transparent">
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".8" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.WindowButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="MinWidth" Value="30" />
+        <Setter Property="MinHeight" Value="28" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <controls:SmallPanel Background="Transparent">
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" Opacity="0.7" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="1" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Pressed">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="1" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Disabled">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_ContentPresenter" Storyboard.TargetProperty="(UIElement.Opacity)" To="0.3" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Focused" />
+                                <VisualState x:Name="Unfocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultButton}" TargetType="{x:Type Button}" />
+    <Style x:Key="WPFDevelopersWindow" BasedOn="{x:Null}" TargetType="{x:Type wd:Window}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+        <Setter Property="TitleBackground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Ideal" />
+        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="MaxHeight" Value="{x:Static SystemParameters.MaximizedPrimaryScreenHeight}" />
+        <Setter Property="MaxWidth" Value="{x:Static SystemParameters.MaximizedPrimaryScreenWidth}" />
+        <Setter Property="FontFamily" Value="{DynamicResource WD.NormalFontFamily}" />
+        <Setter Property="WindowChrome.WindowChrome">
+            <Setter.Value>
+                <WindowChrome CaptionHeight="{Binding TitleHeight, RelativeSource={RelativeSource AncestorType=wd:Window}}" GlassFrameThickness="0,0,0,.1" UseAeroCaptionButtons="False" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type wd:Window}">
+                    <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <Grid x:Name="LayoutRoot">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <controls:SmallPanel Grid.Row="0" Background="{TemplateBinding TitleBackground}">
+                                <Grid x:Name="PART_GridChrome" Height="{TemplateBinding TitleHeight}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" MinWidth="30" />
+                                    </Grid.ColumnDefinitions>
+                                    <Image Width="30" Height="30" Margin="14,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality" Source="{TemplateBinding Icon}" Stretch="Fill" Visibility="{TemplateBinding Icon,&#xD;&#xA;                                                                     Converter={StaticResource ObjectNullToVisibilityConverter}}" />
+                                    <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}}">
+                                                <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}}">
+                                                <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">
+                                                <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}}">
+                                            <Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
+                                        </Button>
+                                    </WrapPanel>
+                                </Grid>
+                                <ContentPresenter x:Name="PART_TitleToolBar" Content="{Binding TitleBar, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" Focusable="False" Visibility="Collapsed" WindowChrome.IsHitTestVisibleInChrome="True" />
+                            </controls:SmallPanel>
+                            <AdornerDecorator Grid.Row="1" KeyboardNavigation.IsTabStop="False">
+                                <ContentPresenter x:Name="MainContentPresenter" ClipToBounds="True" />
+                            </AdornerDecorator>
+                            <ResizeGrip x:Name="ResizeGrip" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Bottom" IsTabStop="False" Visibility="Collapsed" />
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter TargetName="PART_RestoreButton" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_MaximizeButton" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Border" Property="Margin" Value="7" />
+                        </Trigger>
+                        <Trigger Property="WindowStyle" Value="ToolWindow">
+                            <Setter TargetName="PART_MinAndMax" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="NoChrome" Value="True">
+                            <Setter TargetName="PART_GridChrome" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_TitleToolBar" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="ResizeMode" Value="CanResizeWithGrip" />
+                                <Condition Property="WindowState" Value="Normal" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="ResizeGrip" Property="Visibility" Value="Visible" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Menu}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Menu}">
+                    <Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                        <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.SeparatorStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Separator}">
+        <Setter Property="Height" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Margin" Value="0,2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Separator}">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="WD.TopLevelHeaderTemplateKey" TargetType="{x:Type MenuItem}">
+        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,1,1,0" SnapsToDevicePixels="True">
+            <controls:SmallPanel Background="Transparent">
+                <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
+                <Popup x:Name="Popup" AllowsTransparency="True" Focusable="False" IsOpen="{TemplateBinding IsSubmenuOpen}" Placement="Bottom" PlacementTarget="{Binding ElementName=Border}">
+                    <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" />
+                            </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" />
+                    </Grid>
+                </Popup>
+            </controls:SmallPanel>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsSuspendingPopupAnimation" Value="True">
+                <Setter TargetName="Popup" Property="PopupAnimation" Value="None" />
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsSubmenuOpen" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.TopLevelItemTemplateKey" TargetType="{x:Type MenuItem}">
+        <Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <controls:SmallPanel Background="Transparent">
+                <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
+            </controls:SmallPanel>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.SubmenuItemTemplateKey" TargetType="{x:Type MenuItem}">
+        <Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <Grid Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="24" SharedSizeGroup="Icon" />
+                    <ColumnDefinition Width="4" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="30" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="20" />
+                </Grid.ColumnDefinitions>
+                <ContentPresenter x:Name="Icon" Margin="1" VerticalAlignment="Center" ContentSource="Icon" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                <Path x:Name="CheckMark" Width="12" Height="10" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" Visibility="Hidden" />
+                <ContentPresenter x:Name="HeaderHost" Grid.Column="2" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
+                <TextBlock x:Name="InputGestureText" Grid.Column="4" Margin="5,2,0,2" DockPanel.Dock="Right" Text="{TemplateBinding InputGestureText}" />
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="ButtonBase.Command" Value="{x:Null}" />
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.SubmenuHeaderTemplateKey" TargetType="{x:Type MenuItem}">
+        <Border x:Name="Border" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" MinWidth="24" SharedSizeGroup="Icon" />
+                    <ColumnDefinition Width="4" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" SharedSizeGroup="Shortcut" />
+                    <ColumnDefinition Width="20" />
+                </Grid.ColumnDefinitions>
+                <ContentPresenter x:Name="Icon" Margin="3,0,0,0" VerticalAlignment="Center" ContentSource="Icon" />
+                <Path x:Name="CheckMark" Width="12" Height="10" Margin="3,0,0,0" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" Visibility="Hidden" />
+                <ContentPresenter x:Name="HeaderHost" Grid.Column="2" Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
+                <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">
+                        <ScrollViewer Margin="0,4" CanContentScroll="True">
+                            <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                        </ScrollViewer>
+                    </Border>
+                </Popup>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="Icon" Value="{x:Null}">
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="CheckMark" Property="Visibility" Value="Visible" />
+                <Setter TargetName="Icon" Property="Visibility" Value="Collapsed" />
+            </Trigger>
+            <Trigger Property="IsHighlighted" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="WD.DefaultMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type MenuItem}">
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Style.Triggers>
+            <Trigger Property="Role" Value="TopLevelHeader">
+                <Setter Property="MinWidth" Value="44" />
+                <Setter Property="Template" Value="{StaticResource WD.TopLevelHeaderTemplateKey}" />
+                <Setter Property="Grid.IsSharedSizeScope" Value="True" />
+            </Trigger>
+            <Trigger Property="Role" Value="TopLevelItem">
+                <Setter Property="Template" Value="{StaticResource WD.TopLevelItemTemplateKey}" />
+            </Trigger>
+            <Trigger Property="Role" Value="SubmenuHeader">
+                <Setter Property="MinWidth" Value="240" />
+                <Setter Property="Template" Value="{StaticResource WD.SubmenuHeaderTemplateKey}" />
+            </Trigger>
+            <Trigger Property="Role" Value="SubmenuItem">
+                <Setter Property="MinWidth" Value="240" />
+                <Setter Property="Template" Value="{StaticResource WD.SubmenuItemTemplateKey}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.SeparatorStyleKey}" TargetType="{x:Type Separator}" />
+    <Style BasedOn="{StaticResource WD.DefaultMenuItem}" TargetType="{x:Type MenuItem}" />
+    <Style BasedOn="{StaticResource WD.DefaultMenu}" TargetType="{x:Type Menu}" />
+    <Style x:Key="WD.DefaultContextMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ContextMenu}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Margin" Value="10" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}">
+                        <ScrollViewer Padding="0,6">
+                            <ItemsPresenter />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultContextMenu}" TargetType="{x:Type ContextMenu}" />
+    <Style x:Key="WD.DefaultRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="4,0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
+                        <BulletDecorator.Bullet>
+                            <Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                                <controls:SmallPanel MinWidth="16" MinHeight="16">
+                                    <Ellipse x:Name="PART_Border" Fill="{TemplateBinding Background}" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BorderThickness}" />
+                                    <Ellipse x:Name="PART_Ellipse" MinWidth="6" MinHeight="6" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5">
+                                        <Ellipse.RenderTransform>
+                                            <ScaleTransform ScaleX="0" ScaleY="0" />
+                                        </Ellipse.RenderTransform>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Unchecked" />
+                                <VisualState x:Name="Indeterminate" />
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(ScaleTransform.ScaleX)" To=".4" Duration="00:00:.3" />
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(ScaleTransform.ScaleY)" To=".4" Duration="00:00:.3" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PART_Border" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="PART_Border" Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Border" Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.PathRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="8" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border Background="Transparent">
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".8" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_ContentPresenter" Property="Opacity" Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ColorRadioButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RadioButton}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="8" />
+        <Setter Property="Width" Value="15" />
+        <Setter Property="Height" Value="15" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderThickness="0" CornerRadius="7">
+                        <Ellipse x:Name="PART_Ellipse" Width="7" Height="7" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" Visibility="Collapsed" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{x:Static Visibility.Visible}" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked" />
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Opacity" Value=".8" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultRadioButton}" TargetType="{x:Type RadioButton}" />
+    <Style x:Key="WD.RepeatButtonTransparent" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ScrollBarThumbVertical" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border x:Name="PART_Thumbborder">
+                        <Rectangle x:Name="PART_Rectangle" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.InfoPressedSolidColorBrush}" RadiusX="1" RadiusY="1" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ScrollBarThumbHorizontal" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border x:Name="PART_Thumbborder">
+                        <Rectangle x:Name="PART_Rectangle" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.InfoPressedSolidColorBrush}" RadiusX="1" RadiusY="1" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultScrollBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollBar}">
+        <Style.Resources>
+            <Storyboard x:Key="ScrollMouseOut">
+                <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="2" Duration="00:00:0.1" />
+            </Storyboard>
+            <Storyboard x:Key="ScrollMouseOver">
+                <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="10" Duration="00:00:0.1" />
+            </Storyboard>
+        </Style.Resources>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Width" Value="12" />
+        <Setter Property="MinWidth" Value="8" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <controls:SmallPanel x:Name="Bg" Width="{TemplateBinding Width}" Background="Transparent" SnapsToDevicePixels="True">
+                        <Track x:Name="PART_Track" Width="2" Margin="0,0,1,0" HorizontalAlignment="Right" IsDirectionReversed="True" IsEnabled="{TemplateBinding IsMouseOver}">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource WD.ScrollBarThumbVertical}" />
+                            </Track.Thumb>
+                        </Track>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource ScrollMouseOut}" />
+                            </Trigger.ExitActions>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ScrollMouseOver}" />
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto" />
+                <Setter Property="MinWidth" Value="0" />
+                <Setter Property="Height" Value="12" />
+                <Setter Property="MinHeight" Value="8" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <ControlTemplate.Resources>
+                                <Storyboard x:Key="ScrollMouseOutHeight">
+                                    <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="2" Duration="00:00:0.1" />
+                                </Storyboard>
+                                <Storyboard x:Key="ScrollMouseOverHeight">
+                                    <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="10" Duration="00:00:0.1" />
+                                </Storyboard>
+                            </ControlTemplate.Resources>
+                            <controls:SmallPanel Height="{TemplateBinding Height}" Background="Transparent" SnapsToDevicePixels="True">
+                                <Track x:Name="PART_Track" Height="2" Margin="0,0,0,1" VerticalAlignment="Bottom" IsEnabled="{TemplateBinding IsMouseOver}" Visibility="Hidden">
+                                    <Track.DecreaseRepeatButton>
+                                        <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                                    </Track.DecreaseRepeatButton>
+                                    <Track.IncreaseRepeatButton>
+                                        <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                                    </Track.IncreaseRepeatButton>
+                                    <Track.Thumb>
+                                        <Thumb Style="{StaticResource WD.ScrollBarThumbHorizontal}" />
+                                    </Track.Thumb>
+                                </Track>
+                            </controls:SmallPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Trigger.ExitActions>
+                                        <BeginStoryboard Storyboard="{StaticResource ScrollMouseOutHeight}" />
+                                    </Trigger.ExitActions>
+                                    <Trigger.EnterActions>
+                                        <BeginStoryboard Storyboard="{StaticResource ScrollMouseOverHeight}" />
+                                    </Trigger.EnterActions>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.ScrollBarHideStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollBar}">
+        <Style.Resources>
+            <Storyboard x:Key="ScrollMouseOut">
+                <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="2" Duration="00:00:0.1" />
+            </Storyboard>
+            <Storyboard x:Key="ScrollMouseOver">
+                <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Width" To="10" Duration="00:00:0.1" />
+            </Storyboard>
+        </Style.Resources>
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Width" Value="12" />
+        <Setter Property="MinWidth" Value="8" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollBar}">
+                    <controls:SmallPanel Width="{TemplateBinding Width}" Background="Transparent" SnapsToDevicePixels="True">
+                        <Track x:Name="PART_Track" Width="2" Margin="0,0,1,0" HorizontalAlignment="Right" IsDirectionReversed="True" IsEnabled="{TemplateBinding IsMouseOver}">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb Style="{StaticResource WD.ScrollBarThumbVertical}" />
+                            </Track.Thumb>
+                        </Track>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.ExitActions>
+                                <BeginStoryboard Storyboard="{StaticResource ScrollMouseOut}" />
+                            </Trigger.ExitActions>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard Storyboard="{StaticResource ScrollMouseOver}" />
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Horizontal">
+                <Setter Property="Width" Value="Auto" />
+                <Setter Property="MinWidth" Value="0" />
+                <Setter Property="Height" Value="12" />
+                <Setter Property="MinHeight" Value="8" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ScrollBar}">
+                            <ControlTemplate.Resources>
+                                <Storyboard x:Key="ScrollMouseOutHeight">
+                                    <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="2" Duration="00:00:0.1" />
+                                </Storyboard>
+                                <Storyboard x:Key="ScrollMouseOverHeight">
+                                    <DoubleAnimation Storyboard.TargetName="PART_Track" Storyboard.TargetProperty="Height" To="10" Duration="00:00:0.1" />
+                                </Storyboard>
+                            </ControlTemplate.Resources>
+                            <controls:SmallPanel Height="{TemplateBinding Height}" Background="Transparent" SnapsToDevicePixels="True">
+                                <Track x:Name="PART_Track" Height="2" Margin="0,0,0,1" VerticalAlignment="Bottom" IsEnabled="{TemplateBinding IsMouseOver}" Visibility="Hidden">
+                                    <Track.DecreaseRepeatButton>
+                                        <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                                    </Track.DecreaseRepeatButton>
+                                    <Track.IncreaseRepeatButton>
+                                        <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}" Style="{StaticResource WD.RepeatButtonTransparent}" />
+                                    </Track.IncreaseRepeatButton>
+                                    <Track.Thumb>
+                                        <Thumb Style="{StaticResource WD.ScrollBarThumbHorizontal}" />
+                                    </Track.Thumb>
+                                </Track>
+                            </controls:SmallPanel>
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="IsMouseOver" Value="True">
+                                    <Trigger.ExitActions>
+                                        <BeginStoryboard Storyboard="{StaticResource ScrollMouseOutHeight}" />
+                                    </Trigger.ExitActions>
+                                    <Trigger.EnterActions>
+                                        <BeginStoryboard Storyboard="{StaticResource ScrollMouseOverHeight}" />
+                                    </Trigger.EnterActions>
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.DefaultScrollViewer" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="0" Grid.RowSpan="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="{TemplateBinding Padding}" CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        <ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="0" Grid.Column="1" AutomationProperties.AutomationId="VerticalScrollBar" Cursor="Arrow" Maximum="{TemplateBinding ScrollableHeight}" Minimum="0" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" AutomationProperties.AutomationId="HorizontalScrollBar" Cursor="Arrow" Maximum="{TemplateBinding ScrollableWidth}" Minimum="0" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultScrollBar}" TargetType="{x:Type ScrollBar}" />
+    <Style BasedOn="{StaticResource WD.DefaultScrollViewer}" TargetType="{x:Type ScrollViewer}" />
+    <Style x:Key="WD.SliderThumbStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="12" />
+        <Setter Property="Height" Value="12" />
+        <Setter Property="Background" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1.5" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="WD.ThumbMouseOver">
+                            <DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="1.2" To="1.4" Duration="00:00:0.1" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1.2" To="1.4" Duration="00:00:0.1" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="6" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="True">
+                        <Border.RenderTransform>
+                            <ScaleTransform ScaleX="1.2" ScaleY="1.2" />
+                        </Border.RenderTransform>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboard" Storyboard="{StaticResource WD.ThumbMouseOver}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
+        <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>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="WD.SliderHorizontal" TargetType="{x:Type Slider}">
+        <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="True" SnapsToDevicePixels="True">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TickBar x:Name="TopTick" Grid.Row="0" Height="4" Margin="0,0,0,2" Fill="{TemplateBinding Foreground}" Placement="Top" Visibility="Collapsed" />
+                <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}" />
+                    </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}" />
+                    </Track.IncreaseRepeatButton>
+                    <Track.Thumb>
+                        <Thumb Style="{StaticResource WD.SliderThumbStyle}" />
+                    </Track.Thumb>
+                </Track>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="TickPlacement" Value="TopLeft">
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="TickPlacement" Value="BottomRight">
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="TickPlacement" Value="Both">
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.SliderVertical" TargetType="{x:Type Slider}">
+        <Border Padding="{TemplateBinding Padding}" HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type Slider}}}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" ClipToBounds="True" SnapsToDevicePixels="True">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" MinWidth="{TemplateBinding MinWidth}" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TickBar x:Name="TopTick" Grid.Column="0" Width="4" Margin="0,0,2,0" Fill="{TemplateBinding Foreground}" Placement="Left" Visibility="Collapsed" />
+                <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}" />
+                    </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}" />
+                    </Track.IncreaseRepeatButton>
+                    <Track.Thumb>
+                        <Thumb Style="{StaticResource WD.SliderThumbStyle}" />
+                    </Track.Thumb>
+                </Track>
+            </Grid>
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="TickPlacement" Value="TopLeft">
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="TickPlacement" Value="BottomRight">
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+            <Trigger Property="TickPlacement" Value="Both">
+                <Setter TargetName="TopTick" Property="Visibility" Value="Visible" />
+                <Setter TargetName="BottomTick" Property="Visibility" Value="Visible" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="WD.DefaultSlider" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Slider}">
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="False" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="SelectionEnd" Value="{Binding RelativeSource={RelativeSource Self}, Path=Value}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template" Value="{StaticResource WD.SliderHorizontal}" />
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="Template" Value="{StaticResource WD.SliderVertical}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultSlider}" TargetType="{x:Type Slider}" />
+    <Style x:Key="WD.DefaultHyperlink" TargetType="{x:Type Hyperlink}">
+        <Setter Property="FontSize" Value="{StaticResource WD.NormalFontSize}" />
+        <Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
+        <Setter Property="FontStyle" Value="{StaticResource WD.NormalFontStyle}" />
+        <Setter Property="FontWeight" Value="{StaticResource WD.NormalFontWeight}" />
+        <Setter Property="FontStretch" Value="{StaticResource WD.NormalFontStretch}" />
+        <Setter Property="FrameworkElement.OverridesDefaultStyle" Value="True" />
+        <Setter Property="TextBlock.TextDecorations" Value="{x:Null}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="TextBlock.TextDecorations">
+                    <Setter.Value>
+                        <TextDecorationCollection>
+                            <TextDecoration Location="Underline" />
+                        </TextDecorationCollection>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultHyperlink}" TargetType="{x:Type Hyperlink}" />
+    <Style x:Key="WD.DefaultCheckBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CheckBox}">
+        <Setter Property="Padding" Value="4,0" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type CheckBox}">
+                    <BulletDecorator Margin="{TemplateBinding Margin}" Background="Transparent">
+                        <BulletDecorator.Bullet>
+                            <Border HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" CornerRadius="{Binding ElementName=PART_Border, Path=CornerRadius}">
+                                <Border x:Name="PART_Border" Width="16" Height="16" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                                    <controls:SmallPanel>
+                                        <Path x:Name="PART_CheckMark" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" RenderTransformOrigin=".5,.5" SnapsToDevicePixels="False" Stretch="Fill">
+                                            <Path.RenderTransform>
+                                                <ScaleTransform ScaleX="0" ScaleY="0" />
+                                            </Path.RenderTransform>
+                                        </Path>
+                                        <Rectangle x:Name="PART_InderminateMark" Width="6" Height="2" HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" RenderTransformOrigin=".5,.5">
+                                            <Rectangle.RenderTransform>
+                                                <ScaleTransform ScaleX="0" />
+                                            </Rectangle.RenderTransform>
+                                        </Rectangle>
+                                    </controls:SmallPanel>
+                                </Border>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_CheckMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleX)" To=".7" Duration="00:00:.2" />
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_CheckMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleY)" To=".5" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked" />
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="{x:Null}">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="PART_BeginStoryboardIsCheckedNull">
+                                    <Storyboard>
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_InderminateMark" Storyboard.TargetProperty="(Path.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <RemoveStoryboard BeginStoryboardName="PART_BeginStoryboardIsCheckedNull" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsChecked" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultCheckBox}" TargetType="{x:Type CheckBox}" />
+    <Style x:Key="WD.DefaultTextBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TextBox}">
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="AllowDrop" Value="True" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TextBox}">
+                    <Border Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <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>
+                        <Trigger Property="Text" Value="">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="Text" Value="{x:Null}">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <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>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}" />
+    <ControlTemplate x:Key="WD.ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Border x:Name="PART_Border" Padding="6,1.2" BorderThickness="0" SnapsToDevicePixels="true">
+            <Grid Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="30" />
+                </Grid.ColumnDefinitions>
+                <Rectangle Grid.Column="1" Width="30" Height="Auto" Margin="0,1" Fill="{TemplateBinding Background}" />
+                <Path x:Name="PART_Arrow" Grid.Column="1" Width="10" Height="6" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.ChevronDownGeometry}" RenderTransformOrigin=".5,.5" Stretch="Fill">
+                    <Path.Fill>
+                        <SolidColorBrush Color="{DynamicResource WD.PlaceholderTextColor}" />
+                    </Path.Fill>
+                    <Path.RenderTransform>
+                        <RotateTransform Angle="0" />
+                    </Path.RenderTransform>
+                </Path>
+            </Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver" />
+                    <VisualState x:Name="Pressed" />
+                    <VisualState x:Name="Disabled" />
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="CheckStates">
+                    <VisualState x:Name="Checked">
+                        <Storyboard>
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Arrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-180" Duration="00:00:.3" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Unchecked">
+                        <Storyboard>
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Arrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.3" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Indeterminate" />
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+        </Border>
+    </ControlTemplate>
+    <Style x:Key="WD.DefaultComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ComboBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+                        <controls:SmallPanel>
+                            <ContentPresenter x:Name="ContentSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" IsHitTestVisible="False" />
+                            <TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="{TemplateBinding IsReadOnly}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Visibility="Hidden" />
+                            <TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+                            <ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Press" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
+                            <Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" AllowsTransparency="True" Focusable="False" HorizontalOffset="-1" IsOpen="{TemplateBinding IsDropDownOpen}" Placement="Bottom" StaysOpen="False">
+                                <controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                                    <ScrollViewer Margin="0,8" ClipToBounds="False" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                                        <ItemsPresenter KeyboardNavigation.DirectionalNavigation="Contained" />
+                                    </ScrollViewer>
+                                </controls:SmallPanel>
+                            </Popup>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualState x:Name="Normal" />
+                                    <VisualState x:Name="MouseOver">
+                                        <Storyboard>
+                                            <ColorAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" To="{DynamicResource WD.PrimaryNormalColor}" Duration="00:00:.1" />
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled" />
+                                </VisualStateGroup>
+                                <VisualStateGroup x:Name="EditStates">
+                                    <VisualState x:Name="Editable" />
+                                    <VisualState x:Name="Uneditable" />
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                        </controls:SmallPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="False">
+                            <Setter TargetName="PART_DropDownBorder" Property="MinHeight" Value="95" />
+                        </Trigger>
+                        <Trigger Property="IsGrouping" Value="True">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+                            <Setter TargetName="PART_DropDownBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                            <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+                        </Trigger>
+                        <Trigger Property="ComboBox.IsEditable" Value="True">
+                            <Setter Property="KeyboardNavigation.IsTabStop" Value="False" />
+                            <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="ContentSite" Property="UIElement.Visibility" Value="Hidden" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition SourceName="PART_EditableTextBox" Property="Text" Value="" />
+                                <Condition Property="ComboBox.IsEditable" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="SelectionBoxItem" Value="" />
+                                <Condition Property="ComboBox.IsEditable" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="SelectionBoxItem" Value="{x:Null}" />
+                                <Condition Property="ComboBox.IsEditable" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultComboBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ComboBoxItem}">
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Margin" Value="1,0" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="FontSize" Value="{Binding FontSize, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBoxItem}">
+                    <Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <controls:SmallPanel>
+                            <Rectangle x:Name="PART_RectangleMouseOver" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                            <Rectangle x:Name="PART_RectangleSelected" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{DynamicResource WD.BaseSolidColorBrush}" SnapsToDevicePixels="True" UseLayoutRounding="True" Visibility="Collapsed" />
+                            <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
+                        </controls:SmallPanel>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_RectangleMouseOver" Property="Fill" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="PART_RectangleSelected" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.FontWeight" Value="Bold" />
+                        </MultiTrigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_RectangleMouseOver" Property="Fill" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultComboBoxItem}" TargetType="{x:Type ComboBoxItem}" />
+    <Style BasedOn="{StaticResource WD.DefaultComboBox}" TargetType="{x:Type ComboBox}" />
+    <Style x:Key="WD.DefaultToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="4,0" />
+        <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <BulletDecorator Background="Transparent">
+                        <BulletDecorator.Bullet>
+                            <Border x:Name="PART_Border" Width="40" Height="20" Background="{TemplateBinding Background}" CornerRadius="10">
+                                <Ellipse x:Name="PART_Ellipse" Width="16" Height="16" Margin="2,0" HorizontalAlignment="Left" VerticalAlignment="Center" Fill="{DynamicResource WD.WindowForegroundColorBrush}">
+                                    <Ellipse.RenderTransform>
+                                        <TranslateTransform />
+                                    </Ellipse.RenderTransform>
+                                </Ellipse>
+                            </Border>
+                        </BulletDecorator.Bullet>
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)" To="20" Duration="00:00:.3" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(Ellipse.RenderTransform).(TranslateTransform.X)" To="0" Duration="00:00:.3" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </BulletDecorator>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultToggleButton}" TargetType="{x:Type ToggleButton}" />
+    <Style x:Key="WD.CalendarDayButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarDayButton}">
+        <Setter Property="Width" Value="32" />
+        <Setter Property="Height" Value="32" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarDayButton">
+                    <controls:SmallPanel>
+                        <Ellipse x:Name="SelectedBackground" Margin="{TemplateBinding Padding}" Opacity="0">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <Ellipse x:Name="SelectionBackground" Margin="{TemplateBinding Padding}" Opacity="0">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                        <Ellipse x:Name="DayButtonFocusVisual" Width="5" Height="5" HorizontalAlignment="Center" VerticalAlignment="Bottom" IsHitTestVisible="False" Visibility="Collapsed">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <ContentPresenter x:Name="NormalText" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <TextElement.Foreground>
+                                <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
+                            </TextElement.Foreground>
+                        </ContentPresenter>
+                        <Line x:Name="Blackout" Margin="8,3,8,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Opacity=".4" Stroke="{DynamicResource WD.PrimaryTextSolidColorBrush}" StrokeThickness="1.5" Visibility="Collapsed" X1="0" X2="{TemplateBinding Width}" Y1="0" Y2="0" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="CommonStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0:0:0.1" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Normal" />
+                                <VisualState Name="MouseOver" />
+                                <VisualState Name="Pressed" />
+                                <VisualState Name="Disabled" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="SelectionStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Unselected" />
+                                <VisualState Name="Selected">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="SelectionBackground" Storyboard.TargetProperty="Opacity" To=".3" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="CalendarButtonFocusStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="CalendarButtonFocused" />
+                                <VisualState Name="CalendarButtonUnfocused" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="ActiveStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Active" />
+                                <VisualState Name="Inactive" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="DayStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="RegularDay" />
+                                <VisualState Name="Today" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="BlackoutDayStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="NormalDay" />
+                                <VisualState Name="BlackoutDay" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsToday" Value="True">
+                            <Setter TargetName="NormalText" Property="TextElement.FontWeight" Value="Bold" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsBlackedOut" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                            <!--<Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Collapsed"/>-->
+                            <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+                            <Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
+                            <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="SelectedBackground" Property="Opacity" Value="1" />
+                            <Setter TargetName="SelectionBackground" Property="Opacity" Value="0" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsInactive" Value="True" />
+                                <Condition Property="IsBlackedOut" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="False" />
+                                <Condition Property="IsInactive" Value="True" />
+                                <Condition Property="IsBlackedOut" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsBlackedOut" Value="True">
+                            <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.CalendarButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarButton}">
+        <Setter Property="MinWidth" Value="48" />
+        <Setter Property="MinHeight" Value="32" />
+        <Setter Property="FontSize" Value="12" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="4,10" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="CalendarButton">
+                    <controls:SmallPanel>
+                        <Ellipse x:Name="SelectionBackground" Margin="{TemplateBinding Padding}" Opacity=".3" Visibility="Collapsed">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
+                            </Ellipse.Fill>
+                        </Ellipse>
+                        <ContentPresenter x:Name="NormalText" Margin="3,20" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <TextElement.Foreground>
+                                <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
+                            </TextElement.Foreground>
+                        </ContentPresenter>
+                        <Ellipse x:Name="ButtonFocusVisual" Width="5" Height="5" HorizontalAlignment="Center" VerticalAlignment="Bottom" IsHitTestVisible="False">
+                            <Ellipse.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
+                            </Ellipse.Fill>
+                            <Ellipse.Visibility>
+                                <MultiBinding Converter="{StaticResource WD.DatePickerToCurrentConverter}">
+                                    <Binding ElementName="NormalText" Path="Content" />
+                                    <Binding RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type CalendarButton}, AncestorLevel=1}" />
+                                    <Binding Path="DataContext" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type CalendarButton}, AncestorLevel=1}" />
+                                </MultiBinding>
+                            </Ellipse.Visibility>
+                        </Ellipse>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="CommonStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0:0:0.1" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Normal" />
+                                <VisualState Name="MouseOver">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryMouseOverColor}" />
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState Name="Pressed" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="SelectionStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Unselected" />
+                                <VisualState Name="Selected">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="ActiveStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Active" />
+                                <VisualState Name="Inactive" />
+                            </VisualStateGroup>
+                            <VisualStateGroup Name="CalendarButtonFocusStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="CalendarButtonFocused">
+                                    <Storyboard>
+                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
+                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
+                                        </ColorAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState Name="CalendarButtonUnfocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsInactive" Value="True">
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="SelectionBackground" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="WD.PreviousButtonTemplate" TargetType="{x:Type Button}">
+        <controls:SmallPanel>
+            <controls:SmallPanel Background="Transparent">
+                <Path x:Name="PART_Path" Width="6" Height="10" Margin="14,-6,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Data="{StaticResource WD.PreviousGeometry}" Stretch="Fill">
+                    <Path.Fill>
+                        <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
+                    </Path.Fill>
+                </Path>
+            </controls:SmallPanel>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver">
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" To="{DynamicResource WD.PrimaryMouseOverColor}" Duration="0" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" To=".5" Duration="0" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+        </controls:SmallPanel>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.NextButtonTemplate" TargetType="{x:Type Button}">
+        <controls:SmallPanel>
+            <controls:SmallPanel Background="Transparent">
+                <Path x:Name="PART_Path" Width="6" Height="10" Margin="0,-6,14,0" HorizontalAlignment="Right" VerticalAlignment="Center" Data="{StaticResource WD.NextGeometry}" Stretch="Fill">
+                    <Path.Fill>
+                        <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
+                    </Path.Fill>
+                </Path>
+            </controls:SmallPanel>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver">
+                        <Storyboard>
+                            <ColorAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(SolidColorBrush.Color)" To="{StaticResource WD.PrimaryMouseOverColor}" Duration="0" />
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="PART_Path" Storyboard.TargetProperty="(Shape.Fill).(Brush.Opacity)" To=".5" Duration="0" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+        </controls:SmallPanel>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.HeaderButtonTemplate" TargetType="{x:Type Button}">
+        <controls:SmallPanel>
+            <ContentPresenter x:Name="PART_ButtonContent" Margin="1,4,1,9" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal" />
+                    <VisualState x:Name="MouseOver" />
+                    <VisualState x:Name="Disabled">
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetName="PART_ButtonContent" Storyboard.TargetProperty="Opacity" To=".5" Duration="0" />
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+        </controls:SmallPanel>
+    </ControlTemplate>
+    <Style x:Key="WD.CalendarItemStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type CalendarItem}">
+        <Setter Property="Margin" Value="24,4,24,24" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type CalendarItem}">
+                    <ControlTemplate.Resources>
+                        <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                            <StackPanel>
+                                <TextBlock Margin="0,6" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="12" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" Text="{Binding}" />
+                                <Rectangle Height="1" VerticalAlignment="Bottom" Fill="{DynamicResource WD.BaseSolidColorBrush}" />
+                            </StackPanel>
+                        </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.Effect>
+                                <DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
+                            </Border.Effect>
+                            <Grid Margin="0,20,0,0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <Button x:Name="PART_PreviousButton" Grid.Row="0" Grid.Column="0" Width="28" Height="20" HorizontalAlignment="Left" Focusable="False" Template="{StaticResource WD.PreviousButtonTemplate}" />
+                                <Button x:Name="PART_HeaderButton" Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" FontSize="14" Template="{StaticResource WD.HeaderButtonTemplate}" />
+                                <Button x:Name="PART_NextButton" Grid.Row="0" Grid.Column="2" Width="28" Height="20" HorizontalAlignment="Right" Focusable="False" Template="{StaticResource WD.NextButtonTemplate}" />
+                                <Grid x:Name="PART_MonthView" Grid.Row="1" Grid.ColumnSpan="3" Margin="6,10" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Visible">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                </Grid>
+                                <Grid x:Name="PART_YearView" Grid.Row="1" Grid.ColumnSpan="3" Margin="6,-3,7,6" HorizontalAlignment="Center" VerticalAlignment="Center" Visibility="Hidden">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultCalendar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Calendar}">
+        <Setter Property="CalendarButtonStyle" Value="{StaticResource WD.CalendarButtonStyle}" />
+        <Setter Property="CalendarDayButtonStyle" Value="{StaticResource WD.CalendarDayButtonStyle}" />
+        <Setter Property="CalendarItemStyle" Value="{StaticResource WD.CalendarItemStyle}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Calendar}">
+                    <StackPanel x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+                        <CalendarItem x:Name="PART_CalendarItem" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Style="{TemplateBinding CalendarItemStyle}" />
+                    </StackPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DropDownButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="Button">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="30" />
+                            <ColumnDefinition />
+                        </Grid.ColumnDefinitions>
+                        <Border x:Name="Border" Grid.ColumnSpan="2" Background="{DynamicResource WD.BackgroundSolidColorBrush}" />
+                        <Grid Width="19" Height="18" HorizontalAlignment="Center" VerticalAlignment="Center" FlowDirection="LeftToRight">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="20*" />
+                                <ColumnDefinition Width="20*" />
+                                <ColumnDefinition Width="20*" />
+                                <ColumnDefinition Width="20*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="23*" />
+                                <RowDefinition Height="19*" />
+                                <RowDefinition Height="19*" />
+                                <RowDefinition Height="19*" />
+                            </Grid.RowDefinitions>
+                            <Border x:Name="Highlight" Grid.Row="0" Grid.RowSpan="4" Grid.ColumnSpan="4" Margin="-1" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,1,1" Opacity="1" />
+                            <Border x:Name="Background" Grid.Row="1" Grid.RowSpan="3" Grid.ColumnSpan="4" Margin="0,-1,0,0" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius=".5" Opacity="1" />
+                            <Border x:Name="BackgroundGradient" Grid.Row="1" Grid.RowSpan="3" Grid.ColumnSpan="4" Margin="0,-1,0,0" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.RegularTextSolidColorBrush}" BorderThickness="1" CornerRadius=".5" Opacity="1" />
+                            <Rectangle Grid.RowSpan="1" Grid.ColumnSpan="4" Fill="{DynamicResource WD.RegularTextSolidColorBrush}" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1" />
+                            <Path Grid.Row="1" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="4" Margin="4,3,4,3" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.DatePickerGeometry}" Fill="{DynamicResource WD.RegularTextSolidColorBrush}" RenderTransformOrigin="0.5,0.5" Stretch="Fill" />
+                            <Ellipse Grid.ColumnSpan="4" Width="3" Height="3" HorizontalAlignment="Center" VerticalAlignment="Center" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" StrokeThickness="0" />
+                            <Border x:Name="DisabledVisual" Grid.Row="0" Grid.RowSpan="4" Grid.ColumnSpan="4" BorderBrush="{DynamicResource WD.BackgroundSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,.5,.5" Opacity="0" />
+                        </Grid>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultDatePickerTextBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePickerTextBox}">
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DatePickerTextBox">
+                    <controls:SmallPanel>
+                        <Border x:Name="Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <controls:SmallPanel x:Name="WatermarkContent">
+                                <ContentControl x:Name="PART_Watermark" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:DatePickerHelper.TextTrimming="WordEllipsis" Background="Transparent" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Opacity="0" />
+                                <ScrollViewer x:Name="PART_ContentHost" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                            </controls:SmallPanel>
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup Name="WatermarkStates">
+                                <VisualStateGroup.Transitions>
+                                    <VisualTransition GeneratedDuration="0" />
+                                </VisualStateGroup.Transitions>
+                                <VisualState Name="Unwatermarked" />
+                                <VisualState Name="Watermarked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Watermark" Storyboard.TargetProperty="Opacity" To="1" Duration="0" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultCalendar}" TargetType="{x:Type Calendar}" />
+    <Style BasedOn="{StaticResource WD.DefaultDatePickerTextBox}" TargetType="{x:Type DatePickerTextBox}" />
+    <Style x:Key="WD.DefaultDataGridSelectAllButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Button}">
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Polygon x:Name="Arrow" Margin="0,2,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Points="0,10 10,10 10,0" Stretch="Uniform">
+                            <Polygon.Fill>
+                                <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                            </Polygon.Fill>
+                        </Polygon>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Arrow" Property="Fill" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </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="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="HorizontalGridLinesBrush" Value="{x:Null}" />
+        <Setter Property="VerticalGridLinesBrush" Value="{x:Null}" />
+        <Setter Property="CanUserAddRows" Value="False" />
+        <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">
+                            <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}}}" />
+                                        <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}}" />
+                                        <Grid Grid.Row="2" Grid.Column="1">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="{Binding NonFrozenColumnsViewportHorizontalOffset, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+                                                <ColumnDefinition Width="*" />
+                                            </Grid.ColumnDefinitions>
+                                            <ScrollBar x:Name="PART_HorizontalScrollBar" Grid.Column="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{Binding HorizontalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
+                                        </Grid>
+                                    </Grid>
+                                </ControlTemplate>
+                            </ScrollViewer.Template>
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </controls:WDBorder>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsGrouping" Value="True">
+                <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.DefaultDataGridCell" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridCell}">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridCell}">
+                    <Border x:Name="PART_Border" Margin="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="FocusStates">
+                                <VisualState x:Name="Unfocused" />
+                                <VisualState x:Name="Focused" />
+                            </VisualStateGroup>
+                            <VisualStateGroup x:Name="CurrentStates">
+                                <VisualState x:Name="Regular" />
+                                <VisualState x:Name="Current" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultDataGridRow" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridRow}">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Validation.ErrorTemplate" Value="{x:Null}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="ValidationErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <TextBlock Margin="2,0,0,0" VerticalAlignment="Center" Foreground="{DynamicResource WD.DangerPressedSolidColorBrush}" Text="!" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridRow}">
+                    <Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <SelectiveScrollingGrid>
+                            <SelectiveScrollingGrid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </SelectiveScrollingGrid.ColumnDefinitions>
+                            <SelectiveScrollingGrid.RowDefinitions>
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </SelectiveScrollingGrid.RowDefinitions>
+                            <DataGridCellsPresenter Grid.Column="1" ItemsPanel="{TemplateBinding ItemsPanel}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                            <DataGridDetailsPresenter Grid.Row="1" Grid.Column="1" SelectiveScrollingGrid.SelectiveScrollingOrientation="{Binding AreRowDetailsFrozen, ConverterParameter={x:Static SelectiveScrollingOrientation.Vertical}, Converter={x:Static DataGrid.RowDetailsScrollingConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" Visibility="{TemplateBinding DetailsVisibility}" />
+                            <DataGridRowHeader Grid.RowSpan="2" SelectiveScrollingGrid.SelectiveScrollingOrientation="Vertical" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Row}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+                        </SelectiveScrollingGrid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal_AlternatingRow" />
+                                <VisualState x:Name="Normal_Selected" />
+                                <VisualState x:Name="Unfocused_Selected" />
+                                <VisualState x:Name="Normal_Editing" />
+                                <VisualState x:Name="MouseOver_Editing">
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.DefaultBackgroundColor}" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MouseOver_Unfocused_Editing" />
+                                <VisualState x:Name="Unfocused_Editing" />
+                                <VisualState x:Name="MouseOver">
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.BaseMoveColor}" Duration="0:0:0.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MouseOver_Selected">
+                                    <Storyboard>
+                                        <ColorAnimation Storyboard.TargetName="DGR_Border" Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)" To="{DynamicResource WD.BaseMoveColor}" Duration="0:0:0.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="MouseOver_Unfocused_Selected" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.RowHeaderGripperStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="Height" Value="8" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Cursor" Value="SizeNS" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultDataGridRowHeader" TargetType="{x:Type DataGridRowHeader}">
+        <Setter Property="FontWeight" Value="ExtraBlack" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <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">
+                            <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}}}" />
+                            </StackPanel>
+                        </Border>
+                        <Thumb x:Name="PART_TopHeaderGripper" VerticalAlignment="Top" Style="{StaticResource WD.RowHeaderGripperStyle}" />
+                        <Thumb x:Name="PART_BottomHeaderGripper" VerticalAlignment="Bottom" Style="{StaticResource WD.RowHeaderGripperStyle}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ColumnHeaderGripperStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="8" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Cursor" Value="SizeWE" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Width="{TemplateBinding Width}" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" />
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultDataGridColumnHeader" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridColumnHeader}">
+        <Setter Property="FontWeight" Value="ExtraBlack" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type DataGrid}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeader}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="StoryboardAscending">
+                            <DoubleAnimation Storyboard.TargetName="SortArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="180" Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="StoryboardDescending">
+                            <DoubleAnimation Storyboard.TargetName="SortArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel>
+                        <Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                            <Grid Name="HedearGrid">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" TextElement.Foreground="{TemplateBinding Foreground}" />
+                                <Path x:Name="SortArrow" Grid.Column="1" Width="10" Height="10" Margin="4,0,0,0" VerticalAlignment="Center" Data="{StaticResource WD.SortArrowGeometry}" Fill="{DynamicResource WD.PrimaryPressedSolidColorBrush}" RenderTransformOrigin="0.5,0.5" Stretch="Fill" Visibility="Collapsed">
+                                    <Path.RenderTransform>
+                                        <RotateTransform />
+                                    </Path.RenderTransform>
+                                </Path>
+                            </Grid>
+                        </Border>
+                        <Thumb x:Name="PART_LeftHeaderGripper" HorizontalAlignment="Left" Style="{StaticResource WD.ColumnHeaderGripperStyle}" />
+                        <Thumb x:Name="PART_RightHeaderGripper" HorizontalAlignment="Right" Style="{StaticResource WD.ColumnHeaderGripperStyle}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="SortDirection" Value="Ascending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="StoryboardAscendingBeginStoryboard" />
+                            </Trigger.ExitActions>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="StoryboardAscendingBeginStoryboard" Storyboard="{StaticResource StoryboardAscending}" />
+                            </Trigger.EnterActions>
+                        </Trigger>
+                        <Trigger Property="SortDirection" Value="Descending">
+                            <Setter TargetName="SortArrow" Property="Visibility" Value="Visible" />
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="StoryboardDescendingBeginStoryboard" />
+                            </Trigger.ExitActions>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="StoryboardDescendingBeginStoryboard" Storyboard="{StaticResource StoryboardDescending}" />
+                            </Trigger.EnterActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultDataGridColumnHeadersPresenter" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGridColumnHeadersPresenter}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DataGridColumnHeadersPresenter}">
+                    <controls:SmallPanel>
+                        <DataGridColumnHeader x:Name="PART_FillerColumnHeader" IsHitTestVisible="False" />
+                        <ItemsPresenter />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultDataGridColumnHeadersPresenter}" TargetType="{x:Type DataGridColumnHeadersPresenter}" />
+    <Style BasedOn="{StaticResource WD.DefaultDataGridColumnHeader}" TargetType="{x:Type DataGridColumnHeader}" />
+    <Style BasedOn="{StaticResource WD.DefaultDataGridRowHeader}" TargetType="{x:Type DataGridRowHeader}" />
+    <Style BasedOn="{StaticResource WD.DefaultDataGridRow}" TargetType="{x:Type DataGridRow}" />
+    <Style BasedOn="{StaticResource WD.DefaultDataGridCell}" TargetType="{x:Type DataGridCell}" />
+    <Style BasedOn="{StaticResource WD.DefaultDataGrid}" TargetType="{x:Type DataGrid}" />
+    <Style x:Key="WD.BaseTAndBTabItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabItem}">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="BorderThickness" Value="{StaticResource WD.TabItemBorderThickness}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" RenderTransformOrigin=".5,.5">
+                            <Border.RenderTransform>
+                                <ScaleTransform ScaleX="0" ScaleY="1" />
+                            </Border.RenderTransform>
+                        </Border>
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.BaseLAndRTabItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabItem}">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="BorderThickness" Value="{StaticResource WD.TabItemBorderThickness}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TabItem}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" RenderTransformOrigin=".5,.5">
+                            <Border.RenderTransform>
+                                <ScaleTransform ScaleX="1" ScaleY="0" />
+                            </Border.RenderTransform>
+                        </Border>
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" ContentSource="Header" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Selected">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Border" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.LeftTabItem" BasedOn="{StaticResource WD.BaseLAndRTabItem}" TargetType="{x:Type TabItem}">
+        <Setter Property="BorderThickness" Value="0,0,2,0" />
+    </Style>
+    <Style x:Key="WD.RightTabItem" BasedOn="{StaticResource WD.BaseLAndRTabItem}" TargetType="{x:Type TabItem}">
+        <Setter Property="BorderThickness" Value="2,0,0,0" />
+    </Style>
+    <Style x:Key="WD.TopTabItem" BasedOn="{StaticResource WD.BaseTAndBTabItem}" TargetType="{x:Type TabItem}">
+        <Setter Property="BorderThickness" Value="0,0,0,2" />
+    </Style>
+    <Style x:Key="WD.BottomTabItem" BasedOn="{StaticResource WD.BaseTAndBTabItem}" TargetType="{x:Type TabItem}">
+        <Setter Property="BorderThickness" Value="0,2,0,0" />
+    </Style>
+    <Style x:Key="WD.DefaultTabControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TabControl}">
+        <Setter Property="TabStripPlacement" Value="Top" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.TopTabItem}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <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}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Name="ColumnDefinition0" />
+                                <ColumnDefinition Name="ColumnDefinition1" Width="0" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <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>
+                            <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>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
+                            <Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
+                            <Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="Auto" />
+                            <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">
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="ColumnDefinition0" Property="ColumnDefinition.Width" Value="Auto" />
+                            <Setter TargetName="ColumnDefinition1" Property="ColumnDefinition.Width" Value="*" />
+                            <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">
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="HeaderBorder" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="ColumnDefinition0" Property="ColumnDefinition.Width" Value="*" />
+                            <Setter TargetName="ColumnDefinition1" Property="ColumnDefinition.Width" Value="Auto" />
+                            <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>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultTabControl}" TargetType="{x:Type TabControl}" />
+    <Style x:Key="WD.DefaultPasswordBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type PasswordBox}">
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="PasswordChar" Value="●" />
+        <Setter Property="AllowDrop" Value="True" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="helpers:PasswordBoxHelper.IsMonitoring" Value="True" />
+        <Setter Property="SelectionBrush" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type PasswordBox}">
+                    <Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <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>
+                        <Trigger Property="helpers:PasswordBoxHelper.PasswordLength" Value="0">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <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>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultPasswordBox}" TargetType="{x:Type PasswordBox}" />
+    <Style x:Key="WD.DefaultExpander" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Expander}">
+        <Setter Property="BorderThickness" Value="1" />
+        <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="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">
+                        <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}}">
+                                                        <Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="19" />
+                                                                <ColumnDefinition Width="*" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
+                                                                <Path.Fill>
+                                                                    <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                                                                </Path.Fill>
+                                                                <Path.RenderTransform>
+                                                                    <RotateTransform />
+                                                                </Path.RenderTransform>
+                                                            </Path>
+                                                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CheckStates">
+                                                                <VisualState x:Name="Checked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Unchecked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Indeterminate" />
+                                                            </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.RenderTransform>
+                                    <ScaleTransform ScaleY="0" />
+                                </Border.RenderTransform>
+                                <ContentPresenter x:Name="ExpandSite" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" Focusable="False" />
+                            </Border>
+                        </DockPanel>
+                    </Border>
+                    <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" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value="0,.5" />
+                            <Setter TargetName="PART_Content" Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="0" />
+                                </Setter.Value>
+                            </Setter>
+                            <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}}">
+                                                        <Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.RowDefinitions>
+                                                                <RowDefinition Height="19" />
+                                                                <RowDefinition Height="*" />
+                                                            </Grid.RowDefinitions>
+                                                            <controls:SmallPanel>
+                                                                <controls:SmallPanel.LayoutTransform>
+                                                                    <TransformGroup>
+                                                                        <RotateTransform Angle="90" />
+                                                                    </TransformGroup>
+                                                                </controls:SmallPanel.LayoutTransform>
+                                                                <Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
+                                                                    <Path.Fill>
+                                                                        <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                                                                    </Path.Fill>
+                                                                    <Path.RenderTransform>
+                                                                        <RotateTransform />
+                                                                    </Path.RenderTransform>
+                                                                </Path>
+                                                            </controls:SmallPanel>
+                                                            <ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CheckStates">
+                                                                <VisualState x:Name="Checked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-90" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Unchecked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Indeterminate" />
+                                                            </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>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Up">
+                            <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Top" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Bottom" />
+                            <Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value=".5,1" />
+                            <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}}">
+                                                        <Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="19" />
+                                                                <ColumnDefinition Width="*" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <controls:SmallPanel>
+                                                                <Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
+                                                                    <Path.Fill>
+                                                                        <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                                                                    </Path.Fill>
+                                                                    <Path.RenderTransform>
+                                                                        <RotateTransform />
+                                                                    </Path.RenderTransform>
+                                                                </Path>
+                                                            </controls:SmallPanel>
+                                                            <ContentPresenter Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CheckStates">
+                                                                <VisualState x:Name="Checked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="-90" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Unchecked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Indeterminate" />
+                                                            </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>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="ExpandDirection" Value="Left">
+                            <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Left" />
+                            <Setter TargetName="HeaderSite" Property="DockPanel.Dock" Value="Right" />
+                            <Setter TargetName="PART_Content" Property="RenderTransformOrigin" Value="1,.5" />
+                            <Setter TargetName="PART_Content" Property="RenderTransform">
+                                <Setter.Value>
+                                    <ScaleTransform ScaleX="0" />
+                                </Setter.Value>
+                            </Setter>
+                            <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}}">
+                                                        <Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
+                                                            <Grid.RowDefinitions>
+                                                                <RowDefinition Height="19" />
+                                                                <RowDefinition Height="*" />
+                                                            </Grid.RowDefinitions>
+                                                            <controls:SmallPanel>
+                                                                <controls:SmallPanel.LayoutTransform>
+                                                                    <TransformGroup>
+                                                                        <RotateTransform Angle="90" />
+                                                                    </TransformGroup>
+                                                                </controls:SmallPanel.LayoutTransform>
+                                                                <Path x:Name="ExpandededArrow" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
+                                                                    <Path.Fill>
+                                                                        <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                                                                    </Path.Fill>
+                                                                    <Path.RenderTransform>
+                                                                        <RotateTransform />
+                                                                    </Path.RenderTransform>
+                                                                </Path>
+                                                            </controls:SmallPanel>
+                                                            <ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Top" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" RecognizesAccessKey="True" SnapsToDevicePixels="True" />
+                                                        </Grid>
+                                                        <VisualStateManager.VisualStateGroups>
+                                                            <VisualStateGroup x:Name="CheckStates">
+                                                                <VisualState x:Name="Checked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Unchecked">
+                                                                    <Storyboard>
+                                                                        <DoubleAnimation Storyboard.TargetName="ExpandededArrow" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                                                                    </Storyboard>
+                                                                </VisualState>
+                                                                <VisualState x:Name="Indeterminate" />
+                                                            </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>
+                                    </Style>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="True" />
+                                <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>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_DownBeginStoryboard" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="True" />
+                                <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>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_RightBeginStoryboard" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="True" />
+                                <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>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_UpBeginStoryboard" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsExpanded" Value="True" />
+                                <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>
+                                        <DoubleAnimation Storyboard.TargetName="PART_Content" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </MultiTrigger.EnterActions>
+                            <MultiTrigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_LeftBeginStoryboard" />
+                            </MultiTrigger.ExitActions>
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultExpander}" TargetType="{x:Type Expander}" />
+    <Style x:Key="WD.DefaultGroupBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GroupBox}">
+        <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.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">
+                            <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">
+                            <ContentPresenter Margin="{TemplateBinding Padding}" />
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultGroupBox}" TargetType="{x:Type GroupBox}" />
+    <Style x:Key="WD.DefaultListBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <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="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">
+                            <VirtualizingStackPanel IsItemsHost="True" />
+                        </ScrollViewer>
+                    </controls:WDBorder>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsGrouping" Value="True">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <controls:SmallPanel>
+                        <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}" />
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="SelectionStates">
+                                <VisualState x:Name="Unselected" />
+                                <VisualState x:Name="Selected" />
+                                <VisualState x:Name="SelectedUnfocused" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type ListBox}" />
+    <Style BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type ListBoxItem}" />
+    <Style x:Key="WD.GridViewScrollViewerStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ScrollViewer}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ScrollViewer}">
+                    <controls:SmallPanel>
+                        <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_VerticalScrollBar" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{TemplateBinding VerticalOffset}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.GridViewColumnHeaderGripper" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Thumb}">
+        <Setter Property="Width" Value="18" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Thumb}">
+                    <Border Padding="{TemplateBinding Padding}" Background="Transparent">
+                        <Rectangle Width="1" HorizontalAlignment="Center" Fill="{TemplateBinding Background}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultGridViewColumnHeader" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type GridViewColumnHeader}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FontWeight" Value="ExtraBlack" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridViewColumnHeader}">
+                    <controls:SmallPanel>
+                        <Border x:Name="HeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentPresenter x:Name="HeaderContent" Margin="0,0,0,1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
+                        </Border>
+                        <Thumb x:Name="PART_HeaderGripper" Margin="0,0,-9,0" HorizontalAlignment="Right" Style="{StaticResource WD.GridViewColumnHeaderGripper}" />
+                        <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>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultListView" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListView}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <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">
+                        <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>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsGrouping" Value="True">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultListViewItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListViewItem}">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="0,0,0,1" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListViewItem}">
+                    <Border x:Name="Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <GridViewRowPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="False" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
+                        </MultiTrigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultListViewItem}" TargetType="{x:Type ListViewItem}" />
+    <Style BasedOn="{StaticResource WD.DefaultGridViewColumnHeader}" TargetType="{x:Type GridViewColumnHeader}" />
+    <Style BasedOn="{StaticResource WD.DefaultListView}" TargetType="{x:Type ListView}" />
+    <Style x:Key="WD.DefaultProgressBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ProgressBar}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Height" Value="{StaticResource WD.RepeatButtonSize}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ProgressBar}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="IsIndeterminate" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)">
+                                <EasingDoubleKeyFrame KeyTime="0" Value="0.3" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="0.3" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="0.3" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(UIElement.RenderTransformOrigin)">
+                                <EasingPointKeyFrame EasingFunction="{StaticResource WD.SineEaseOut}" KeyTime="0" Value="-0.5,0.5" />
+                                <EasingPointKeyFrame KeyTime="0:0:1" Value="0.5,0.5" />
+                                <EasingPointKeyFrame EasingFunction="{StaticResource WD.SineEaseOut}" KeyTime="0:0:2" Value="1.5,0.5" />
+                            </PointAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
+                            <Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+                            <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}" />
+                            </Decorator>
+                            <Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
+                                <Rectangle.RenderTransform>
+                                    <ScaleTransform />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                        </controls:SmallPanel>
+                    </controls:WDBorder>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
+                            <Setter TargetName="PART_TemplateRoot" Property="LayoutTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="-90" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsIndeterminate" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="IndeterminateStoryboard" Storyboard="{StaticResource IsIndeterminate}" />
+                            </Trigger.EnterActions>
+                            <Setter TargetName="PART_Indicator" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Rectangle" Property="Visibility" Value="Visible" />
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="IndeterminateStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="helpers:ElementHelper.IsStripe" Value="True">
+                            <Setter Property="Foreground">
+                                <Setter.Value>
+                                    <DrawingBrush Stretch="None" TileMode="Tile" Viewport="0,0,20,6" ViewportUnits="Absolute">
+                                        <DrawingBrush.Transform>
+                                            <TransformGroup>
+                                                <RotateTransform Angle="20" />
+                                                <TranslateTransform X="0" />
+                                            </TransformGroup>
+                                        </DrawingBrush.Transform>
+                                        <DrawingBrush.Drawing>
+                                            <GeometryDrawing>
+                                                <GeometryDrawing.Brush>
+                                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                                        <GradientStop Offset="0" Color="{DynamicResource WD.PrimaryNormalColor}" />
+                                                        <GradientStop Offset="0.5" Color="{DynamicResource WD.PrimaryNormalColor}" />
+                                                        <GradientStop Offset="0.5" Color="Transparent" />
+                                                        <GradientStop Offset="1" Color="Transparent" />
+                                                    </LinearGradientBrush>
+                                                </GeometryDrawing.Brush>
+                                                <GeometryDrawing.Geometry>
+                                                    <RectangleGeometry Rect="0,0,20,6" />
+                                                </GeometryDrawing.Geometry>
+                                            </GeometryDrawing>
+                                        </DrawingBrush.Drawing>
+                                    </DrawingBrush>
+                                </Setter.Value>
+                            </Setter>
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="LoadedBeginStoryboard">
+                                    <Storyboard RepeatBehavior="Forever">
+                                        <DoubleAnimation Storyboard.TargetName="Indicator" Storyboard.TargetProperty="(Border.Background).(Brush.Transform).(TransformGroup.Children)[1].(TranslateTransform.X)" From="0" To="21" Duration="00:00:0.45" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultProgressBar}" TargetType="{x:Type ProgressBar}" />
+    <Style x:Key="WD.DefaultTreeView" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TreeView}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <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">
+                            <ItemsPresenter />
+                        </ScrollViewer>
+                    </controls:WDBorder>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ExpandCollapseToggleStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <controls:SmallPanel Width="15" Height="13" Background="Transparent">
+                            <Path x:Name="Expanded" Width="6" Height="10" Data="{StaticResource WD.NextGeometry}" RenderTransformOrigin=".5,.5" Stretch="Uniform">
+                                <Path.Fill>
+                                    <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
+                                </Path.Fill>
+                                <Path.RenderTransform>
+                                    <RotateTransform />
+                                </Path.RenderTransform>
+                            </Path>
+                        </controls:SmallPanel>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CheckStates">
+                                <VisualState x:Name="Checked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="Expanded" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="90" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Unchecked">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="Expanded" Storyboard.TargetProperty="(Path.RenderTransform).(RotateTransform.Angle)" To="0" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Indeterminate" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.TreeViewItemFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border>
+                        <Rectangle Margin="0,0,0,0" Opacity="0" Stroke="{DynamicResource WD.BlackSolidColorBrush}" StrokeDashArray="1 2" StrokeThickness="5" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultTreeViewItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type TreeViewItem}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="FocusVisualStyle" Value="{StaticResource WD.TreeViewItemFocusVisual}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type TreeViewItem}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" MinWidth="19" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <ToggleButton x:Name="Expander" ClickMode="Press" IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource WD.ExpandCollapseToggleStyle}" />
+                        <Border x:Name="PART_Border" Grid.Column="1" Grid.ColumnSpan="2" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                            <ContentPresenter x:Name="PART_Header" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" ContentSource="Header" />
+                        </Border>
+                        <Border x:Name="PART_ItemsHost" Grid.Row="1" Grid.Column="1" Grid.ColumnSpan="2" RenderTransformOrigin=".5,0">
+                            <Border.RenderTransform>
+                                <ScaleTransform ScaleY="0" />
+                            </Border.RenderTransform>
+                            <ItemsPresenter x:Name="ItemsHost" />
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ExpansionStates">
+                                <VisualState x:Name="Expanded">
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="PART_ItemsHost" Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="Collapsed" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_Border" Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseMoveSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsExpanded" Value="False">
+                            <Setter TargetName="ItemsHost" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="HasItems" Value="False">
+                            <Setter TargetName="Expander" Property="Visibility" Value="Hidden" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="True" />
+                                <Condition Property="IsSelectionActive" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="PART_Border" Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </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}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="SizeToContent" Value="WidthAndHeight" />
+        <Setter Property="ResizeMode" Value="NoResize" />
+        <Setter Property="ShowInTaskbar" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="UseLayoutRounding" Value="True" />
+        <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
+        <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
+        <Setter Property="WindowStyle" Value="ToolWindow" />
+        <Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition />
+                                <RowDefinition />
+                            </Grid.RowDefinitions>
+                            <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}}">
+                                        <Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
+                                    </Button>
+                                </DockPanel>
+                            </controls:SmallPanel>
+                            <controls:SmallPanel Grid.Row="1" Margin="20">
+                                <DockPanel>
+                                    <Path x:Name="PART_Path" Width="25" Height="25" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
+                                    <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">
+                                <UniformGrid Height="38" Rows="1">
+                                    <Button x:Name="PART_ButtonYes" Width="60" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+                                    <Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+                                </UniformGrid>
+                            </controls:SmallPanel>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
+    <Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
+        <Setter Property="Width" Value="40" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:NormalLoading}">
+                    <Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <controls:SmallPanel>
+                            <controls:SmallPanel.Resources>
+                                <Storyboard x:Key="StarStoryboard" RepeatBehavior="Forever">
+                                    <DoubleAnimation Storyboard.TargetName="PART_Ellipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="360" Duration="0:0:1.0" />
+                                </Storyboard>
+                            </controls:SmallPanel.Resources>
+                            <Ellipse Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Stroke="{DynamicResource WD.BaseSolidColorBrush}" StrokeDashArray="100,100" StrokeThickness="2" />
+                            <Ellipse x:Name="PART_Ellipse" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" RenderTransformOrigin=".5,.5" Stretch="Uniform" Stroke="{DynamicResource WD.PrimaryPressedSolidColorBrush}" StrokeDashArray="{TemplateBinding StrokeArray}" StrokeThickness="2">
+                                <Ellipse.RenderTransform>
+                                    <RotateTransform Angle="0" />
+                                </Ellipse.RenderTransform>
+                                <Ellipse.Triggers>
+                                    <EventTrigger RoutedEvent="Loaded">
+                                        <BeginStoryboard x:Name="LoadedBeginStoryboard" Storyboard="{StaticResource StarStoryboard}" />
+                                    </EventTrigger>
+                                    <EventTrigger RoutedEvent="Unloaded">
+                                        <StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
+                                    </EventTrigger>
+                                </Ellipse.Triggers>
+                            </Ellipse>
+                        </controls:SmallPanel>
+                    </Viewbox>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DefaultLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:DefaultLoading}">
+        <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.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)">
+                                <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" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.999" Value="405" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:2.666" Value="540" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:3.333" Value="675" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:3.999" Value="810" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:4.666" Value="945" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:5.332" Value="1080" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(shapes:Arc.StartAngle)">
+                                <SplineDoubleKeyFrame KeyTime="0" Value="-5" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:0.666" Value="-130" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.333" Value="-5" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(shapes:Arc.EndAngle)">
+                                <SplineDoubleKeyFrame KeyTime="0" Value="5" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:0.666" Value="130" />
+                                <SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.333" Value="5" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel x:Name="PART_SmallPanel" RenderTransformOrigin=".5,.5">
+                        <controls:SmallPanel.RenderTransform>
+                            <RotateTransform />
+                        </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 />
+                            </shapes:Arc.RenderTransform>
+                        </shapes:Arc>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.NormalLoading}" TargetType="{x:Type controls:NormalLoading}" />
+    <Style BasedOn="{StaticResource WD.DefaultLoading}" TargetType="{x:Type controls:DefaultLoading}" />
+    <Style x:Key="WD.Theme" TargetType="{x:Type controls:Theme}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Theme}">
+                    <ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:Theme}}">
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <RadioButton Width="40" Height="40" Cursor="Hand" IsChecked="{Binding IsChecked}">
+                                    <RadioButton.Style>
+                                        <Style TargetType="{x:Type RadioButton}">
+                                            <Setter Property="Template">
+                                                <Setter.Value>
+                                                    <ControlTemplate TargetType="{x:Type RadioButton}">
+                                                        <Border x:Name="PART_Border" Padding="2" BorderBrush="{Binding Color}" BorderThickness="0">
+                                                            <controls:SmallPanel Background="{x:Null}">
+                                                                <Rectangle x:Name="PART_Rectangle" Fill="{Binding Color}" />
+                                                                <Path Width="12" Height="10" Margin="0,0,4,4" HorizontalAlignment="Right" VerticalAlignment="Bottom" Data="{StaticResource WD.CheckMarkGeometry}" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" Stretch="Fill" Visibility="{Binding IsChecked, Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                                            </controls:SmallPanel>
+                                                        </Border>
+                                                        <ControlTemplate.Triggers>
+                                                            <Trigger Property="IsMouseOver" Value="True">
+                                                                <Setter TargetName="PART_Rectangle" Property="Opacity" Value=".8" />
+                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
+                                                            </Trigger>
+                                                            <Trigger Property="IsChecked" Value="True">
+                                                                <Setter TargetName="PART_Border" Property="BorderThickness" Value="1" />
+                                                            </Trigger>
+                                                        </ControlTemplate.Triggers>
+                                                    </ControlTemplate>
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Style>
+                                    </RadioButton.Style>
+                                </RadioButton>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <WrapPanel helpers:PanelHelper.Spacing="4" />
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                    </ItemsControl>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.Theme}" TargetType="{x:Type controls:Theme}" />
+    <Style x:Key="WD.GridSplitterPreviewStyle">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle Fill="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Opacity=".6" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="DefaultGridSplitter" TargetType="{x:Type GridSplitter}">
+        <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="PreviewStyle" Value="{StaticResource WD.GridSplitterPreviewStyle}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridSplitter}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource DefaultGridSplitter}" TargetType="{x:Type GridSplitter}" />
+    <Style x:Key="WD.DefaultLabel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type Label}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Label}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultLabel}" TargetType="{x:Type Label}" />
+    <Style x:Key="WD.DefaultRepeatButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <controls:SmallPanel>
+                        <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseCaptured" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultRepeatButton}" TargetType="{x:Type RepeatButton}" />
+    <Style TargetType="{x:Type ec:PathListBox}" x:Key="{x:Type ec:PathListBox}">
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="FrameworkElement.UseLayoutRounding" Value="False" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <ec:PathPanel />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ec:PathListBox}">
+                    <Grid>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="ValidationStates">
+                                <VisualState x:Name="Valid" />
+                                <VisualState x:Name="InvalidUnfocused">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <ObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </ObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                                <VisualState x:Name="InvalidFocused">
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="Visibility" Storyboard.TargetName="ValidationErrorElement">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <ObjectKeyFrame.Value>
+                                                    <Visibility>Visible</Visibility>
+                                                </ObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsOpen" Storyboard.TargetName="validationTooltip">
+                                            <DiscreteObjectKeyFrame KeyTime="0">
+                                                <ObjectKeyFrame.Value>
+                                                    <sys:Boolean>True</sys:Boolean>
+                                                </ObjectKeyFrame.Value>
+                                            </DiscreteObjectKeyFrame>
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" CornerRadius="2">
+                            <ItemsPresenter />
+                        </Border>
+                        <Border Name="ValidationErrorElement" BorderBrush="#FFDB000C" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" Visibility="Collapsed">
+                            <ToolTipService.ToolTip>
+                                <ToolTip Name="validationTooltip" Placement="Right" Template="{StaticResource ValidationToolTipTemplate}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}">
+                                    <FrameworkElement.Triggers>
+                                        <EventTrigger RoutedEvent="Canvas.Loaded">
+                                            <BeginStoryboard>
+                                                <Storyboard>
+                                                    <ObjectAnimationUsingKeyFrames Storyboard.TargetProperty="IsHitTestVisible" Storyboard.TargetName="validationTooltip">
+                                                        <DiscreteObjectKeyFrame KeyTime="0">
+                                                            <ObjectKeyFrame.Value>
+                                                                <sys:Boolean>true</sys:Boolean>
+                                                            </ObjectKeyFrame.Value>
+                                                        </DiscreteObjectKeyFrame>
+                                                    </ObjectAnimationUsingKeyFrames>
+                                                </Storyboard>
+                                            </BeginStoryboard>
+                                        </EventTrigger>
+                                    </FrameworkElement.Triggers>
+                                </ToolTip>
+                            </ToolTipService.ToolTip>
+                            <Grid Background="#00FFFFFF" HorizontalAlignment="Right" Height="10" Margin="0,-4,-4,0" VerticalAlignment="Top" Width="10">
+                                <Path Data="M1,0 L6,0 A2,2 0 0 1 8,2L8,7" Fill="#FFDC000C" Margin="-1,3,0,0" />
+                                <Path Data="M0,0 L2,0 L8,6 L8,8" Fill="#ffffff" Margin="-1,3,0,0" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.AnimationAudio" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:AnimationAudio}">
+        <Setter Property="Width" Value="80" />
+        <Setter Property="Height" Value="35" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="PlayStoryboard" RepeatBehavior="Forever">
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Hidden}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="0:0:.3" Storyboard.TargetName="PART_Path2" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="0:0:.7" Storyboard.TargetName="PART_Path3" Storyboard.TargetProperty="(Path.Visibility)" Duration="0:0:.4">
+                                <DiscreteObjectKeyFrame KeyTime="0:0:0" Value="{x:Static Visibility.Visible}" />
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Border x:Name="PART_Border" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding helpers:ElementHelper.CornerRadius}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <StackPanel x:Name="PART_StackPanel" Width="20" Height="30" Margin="10,0" HorizontalAlignment="Left" Orientation="Horizontal" RenderTransformOrigin=".5,.5">
+                                <Path Width="4" Height="6" Data="{StaticResource WD.AudioOneGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" />
+                                <Path x:Name="PART_Path2" Width="6" Margin="0,7" Data="{StaticResource WD.AudioTwoGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="1.5" />
+                                <Path x:Name="PART_Path3" Width="8" Margin="-3,4" Data="{StaticResource WD.AudioThreeGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Fill" Stroke="Transparent" StrokeThickness="2" />
+                            </StackPanel>
+                            <TextBlock x:Name="PART_TextBlock" Grid.Column="1" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}">
 								<Run x:Name="PART_RunTimeLength" />
-							</TextBlock>
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsPlay" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="PlayBeginStoryboard" Storyboard="{StaticResource PlayStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PlayBeginStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsRight" Value="True">
-							<Setter TargetName="PART_TextBlock" Property="Grid.Column" Value="0" />
-							<Setter TargetName="PART_TextBlock" Property="HorizontalAlignment" Value="Right" />
-							<Setter TargetName="PART_StackPanel" Property="Grid.Column" Value="1" />
-							<Setter TargetName="PART_StackPanel" Property="HorizontalAlignment" Value="Right" />
-							<Setter TargetName="PART_StackPanel" Property="RenderTransform">
-								<Setter.Value>
-									<TransformGroup>
-										<RotateTransform Angle="180" />
-									</TransformGroup>
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.AnimationAudio}" TargetType="{x:Type controls:AnimationAudio}" />
-	<Style x:Key="WD.AnimationNavigationBar3DItem" BasedOn="{StaticResource WD.ControlBasicStyle}" 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}">
-					<Viewport3D Width="{TemplateBinding Height}" Height="{TemplateBinding Width}">
-						<Viewport3D.Triggers>
-							<EventTrigger RoutedEvent="MouseEnter">
-								<BeginStoryboard>
-									<Storyboard Storyboard.TargetName="axis3d" Storyboard.TargetProperty="Angle">
-										<DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" To="90" Duration="00:00:1" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger>
-							<EventTrigger RoutedEvent="MouseLeave">
-								<BeginStoryboard>
-									<Storyboard Storyboard.TargetName="axis3d" Storyboard.TargetProperty="Angle">
-										<DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" To="0" Duration="00:00:1" />
-									</Storyboard>
-								</BeginStoryboard>
-							</EventTrigger>
-						</Viewport3D.Triggers>
-						<Viewport3D.Camera>
-							<OrthographicCamera LookDirection="0,0,-100" Position="0,0,100" UpDirection="0,1,0" />
-						</Viewport3D.Camera>
-						<Viewport3D.Children>
-							<ModelVisual3D>
-								<ModelVisual3D.Content>
-									<AmbientLight Color="{DynamicResource WD.BackgroundColor}" />
-								</ModelVisual3D.Content>
-							</ModelVisual3D>
-							<ContainerUIElement3D>
-								<ContainerUIElement3D.Transform>
-									<RotateTransform3D>
-										<RotateTransform3D.Rotation>
-											<AxisAngleRotation3D x:Name="axis3d" Angle="0" Axis="1 0 0" />
-										</RotateTransform3D.Rotation>
-									</RotateTransform3D>
-								</ContainerUIElement3D.Transform>
-								<Viewport2DVisual3D>
-									<Viewport2DVisual3D.Material>
-										<DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
-									</Viewport2DVisual3D.Material>
-									<Viewport2DVisual3D.Geometry>
-										<MeshGeometry3D Positions="-1,1,1    -1,-1,1   1,-1,1    1,1,1" TextureCoordinates="0,0   0,1     1,1  1,0" TriangleIndices="0 1 2 0 2 3" />
-									</Viewport2DVisual3D.Geometry>
-									<Border Width="110" Height="110" Background="{TemplateBinding Background}" CornerRadius="0,0,0,0">
-										<ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
-									</Border>
-								</Viewport2DVisual3D>
-								<Viewport2DVisual3D>
-									<Viewport2DVisual3D.Material>
-										<DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
-									</Viewport2DVisual3D.Material>
-									<Viewport2DVisual3D.Geometry>
-										<MeshGeometry3D Positions="-1,1,1  1,1,1   1,1,-1   -1,1,-1" TextureCoordinates="0,0   0,1   1,1  1,0" TriangleIndices="0 1 2 0 2 3" />
-									</Viewport2DVisual3D.Geometry>
-									<Border Width="110" Height="110" Background="{TemplateBinding Fill}" CornerRadius="0,0,0,0" RenderTransformOrigin="0.5,0.5">
-										<Border.RenderTransform>
-											<TransformGroup>
-												<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}" />
-									</Border>
-								</Viewport2DVisual3D>
-							</ContainerUIElement3D>
-						</Viewport3D.Children>
-					</Viewport3D>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.AnimationNavigationBar3D" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:AnimationNavigationBar3D}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:AnimationNavigationBar3D}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
-						<ScrollViewer VerticalScrollBarVisibility="Auto">
-							<ItemsPresenter />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<UniformGrid Columns="{Binding Items.Count, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3D}}}" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.AnimationNavigationBar3DItem}" TargetType="{x:Type controls:AnimationNavigationBar3DItem}" />
-	<Style BasedOn="{StaticResource WD.AnimationNavigationBar3D}" TargetType="{x:Type controls:AnimationNavigationBar3D}" />
-	<Style x:Key="WD.BallLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BallLoading}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:BallLoading}">
-					<Viewbox>
-						<controls:SmallPanel x:Name="Part_BackGrid" Width="400" Height="140">
-							<controls:SmallPanel.Effect>
-								<DropShadowEffect BlurRadius="10" Opacity="0.8" ShadowDepth="5" Color="#ff6a27" />
-							</controls:SmallPanel.Effect>
-							<Canvas>
-								<Ellipse x:Name="Part_Eillipse" Canvas.Left="20" Canvas.Top="50" Width="40" Height="40">
-									<Ellipse.Fill>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<GradientStop Offset="0" Color="#ff9303" />
-											<GradientStop Offset="1" Color="#ff8c09" />
-										</LinearGradientBrush>
-									</Ellipse.Fill>
-								</Ellipse>
-							</Canvas>
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<controls:SmallPanel x:Name="Part_EillpseDock1" Grid.Column="1" RenderTransformOrigin="0,0.5">
-									<Ellipse x:Name="Part_Eillipse1" Width="40" Height="40" HorizontalAlignment="Center">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-												<GradientStop Offset="0" Color="#ff781a" />
-												<GradientStop Offset="1" Color="#ff6a27" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-									</Ellipse>
-								</controls:SmallPanel>
-								<controls:SmallPanel x:Name="Part_EillpseDock2" Grid.Column="2" RenderTransformOrigin="0,0.5">
-									<Ellipse x:Name="Part_Eillipse2" Width="40" Height="40" HorizontalAlignment="Center">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-												<GradientStop Offset="0" Color="#ff5539" />
-												<GradientStop Offset="1" Color="#ff4845" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-									</Ellipse>
-								</controls:SmallPanel>
-								<controls:SmallPanel x:Name="Part_EillpseDock3" Grid.Column="3" RenderTransformOrigin="0,0.5">
-									<Ellipse x:Name="Part_Eillipse3" Width="40" Height="40" HorizontalAlignment="Center">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-												<GradientStop Offset="0" Color="#ff3357" />
-												<GradientStop Offset="1" Color="#ff2465" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-									</Ellipse>
-								</controls:SmallPanel>
-								<controls:SmallPanel x:Name="Part_EillpseDock4" Grid.Column="4" RenderTransformOrigin="0,0.5">
-									<Ellipse x:Name="Part_Eillipse4" Width="40" Height="40" HorizontalAlignment="Center">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-												<GradientStop Offset="0" Color="#ff097c" />
-												<GradientStop Offset="1" Color="#ff0382" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-									</Ellipse>
-								</controls:SmallPanel>
-							</Grid>
-						</controls:SmallPanel>
-					</Viewbox>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.BallLoading}" TargetType="{x:Type controls:BallLoading}" />
-	<ControlTemplate x:Key="WD.LampEffectEclipse" TargetType="{x:Type controls:BreathLamp}">
-		<controls:SmallPanel>
-			<Viewbox>
-				<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-					<Border x:Name="PART_LampEclipse" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="0" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
-						<Border.RenderTransform>
-							<ScaleTransform CenterX="0" CenterY="0" ScaleX="0.8" ScaleY="0.8" />
-						</Border.RenderTransform>
-					</Border>
-				</controls:SmallPanel>
-			</Viewbox>
-			<ContentPresenter />
-		</controls:SmallPanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsLampStart" Value="True">
-				<Setter TargetName="PART_LampEclipse" Property="Effect">
-					<Setter.Value>
-						<DropShadowEffect BlurRadius="25" ShadowDepth="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EffectColor}" />
-					</Setter.Value>
-				</Setter>
-				<Trigger.EnterActions>
-					<BeginStoryboard>
-						<Storyboard AutoReverse="True" RepeatBehavior="Forever">
-							<DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampEclipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.1" Duration="0:0:1" />
-							<DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampEclipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.1" Duration="0:0:1" />
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.EnterActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.LampEffectRipple" TargetType="{x:Type controls:BreathLamp}">
-		<controls:SmallPanel>
-			<Viewbox>
-				<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-					<Border x:Name="PART_LampRipple_1" Background="Transparent" BorderBrush="{TemplateBinding Background}" BorderThickness="1" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
-						<Border.RenderTransform>
-							<ScaleTransform CenterX="0" CenterY="0" ScaleX="0.8" ScaleY="0.8" />
-						</Border.RenderTransform>
-					</Border>
-					<Border x:Name="PART_LampRipple_2" Background="Transparent" BorderBrush="{TemplateBinding Background}" BorderThickness="1" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
-						<Border.RenderTransform>
-							<ScaleTransform ScaleX="0.8" ScaleY="0.8" />
-						</Border.RenderTransform>
-					</Border>
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" />
-				</controls:SmallPanel>
-			</Viewbox>
-			<ContentPresenter />
-		</controls:SmallPanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsLampStart" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard>
-						<Storyboard AutoReverse="True" RepeatBehavior="Forever">
-							<DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_1" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.3" Duration="0:0:1" />
-							<DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_1" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.3" Duration="0:0:1" />
-							<DoubleAnimation BeginTime="0:0:0.4" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_2" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.3" Duration="0:0:1" />
-							<DoubleAnimation BeginTime="0:0:0.4" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_2" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.3" Duration="0:0:1" />
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.EnterActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<ControlTemplate x:Key="WD.LampEffectOuterGlow" TargetType="{x:Type controls:BreathLamp}">
-		<controls:SmallPanel>
-			<Viewbox>
-				<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-					<Border x:Name="PART_LampOuterGlow" Margin="1" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="0" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
-						<Border.Effect>
-							<DropShadowEffect x:Name="PART_LampOuterGlow_Effect" BlurRadius="0" ShadowDepth="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EffectColor}" />
-						</Border.Effect>
-					</Border>
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" />
-				</controls:SmallPanel>
-			</Viewbox>
-			<ContentPresenter />
-		</controls:SmallPanel>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsLampStart" Value="True">
-				<Trigger.EnterActions>
-					<BeginStoryboard>
-						<Storyboard RepeatBehavior="Forever">
-							<DoubleAnimation AutoReverse="True" BeginTime="0" EasingFunction="{StaticResource WD.SineEaseInOut}" Storyboard.TargetName="PART_LampOuterGlow_Effect" Storyboard.TargetProperty="BlurRadius" From="0" To="40" Duration="0:0:0.6" />
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.EnterActions>
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="WD.BreathLamp" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreathLamp}">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Height" Value="60" />
-		<Setter Property="Width" Value="60" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="EffectColor" Value="{StaticResource WD.PrimaryNormalColor}" />
-		<Style.Triggers>
-			<Trigger Property="LampEffect" Value="Eclipse">
-				<Setter Property="Template" Value="{StaticResource WD.LampEffectEclipse}" />
-			</Trigger>
-			<Trigger Property="LampEffect" Value="Ripple">
-				<Setter Property="Template" Value="{StaticResource WD.LampEffectRipple}" />
-			</Trigger>
-			<Trigger Property="LampEffect" Value="OuterGlow">
-				<Setter Property="Template" Value="{StaticResource WD.LampEffectOuterGlow}" />
-			</Trigger>
-			<Trigger Property="LampEffect" Value="Streamer">
-				<Setter Property="Template" Value="{StaticResource WD.LampEffectStreamer}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.BreathLamp}" TargetType="{x:Type controls:BreathLamp}" />
-	<Style x:Key="WD.MasterCarousel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MasterCarousel}">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MasterCarousel}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<Viewbox>
-							<Canvas x:Name="PART_ContentDock" Width="900" Height="400" />
-						</Viewbox>
-						<StackPanel x:Name="PART_ButtonDock" Margin="0,210,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.EmphasizerCarousel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:EmphasizerCarousel}">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:EmphasizerCarousel}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<Canvas x:Name="PART_BackCanvas" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.EmphasizerCarousel}" TargetType="{x:Type controls:EmphasizerCarousel}" />
-	<Style BasedOn="{StaticResource WD.MasterCarousel}" TargetType="{x:Type controls:MasterCarousel}" />
-	<Style x:Key="WD.VerifyCode" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:VerifyCode}">
-		<Setter Property="Background" Value="{x:Null}" />
-		<Setter Property="Width" Value="100" />
-		<Setter Property="Height" Value="40" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:VerifyCode}">
-					<Image x:Name="PART_Image" Source="{TemplateBinding ImageSource}" Stretch="Fill" />
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.VerifyCode}" TargetType="{x:Type controls:VerifyCode}" />
-	<Style x:Key="WD.CircularMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularMenuItem}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CircularMenuItem}">
-					<controls:SmallPanel VerticalAlignment="Top">
-						<controls:SmallPanel.RenderTransform>
-							<RotateTransform x:Name="PART_RotateTransform" Angle="{TemplateBinding Angle}" CenterX="200" CenterY="200" />
-						</controls:SmallPanel.RenderTransform>
-						<Path x:Name="PART_Path" VerticalAlignment="Center" Data="{StaticResource WD.CircularGeometry}" Fill="{TemplateBinding BackgroundColor}" />
-						<Image Width="40" Height="40" Margin="60,100,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding IconImage}">
-							<Image.RenderTransform>
-								<RotateTransform Angle="-70" />
-							</Image.RenderTransform>
-						</Image>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Path" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.CircularMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularMenu}">
-		<Setter Property="Width" Value="400" />
-		<Setter Property="Height" Value="400" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CircularMenu}">
-					<controls:SmallPanel>
-						<ItemsControl x:Name="PART_ItemsControl" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" AlternationCount="{TemplateBinding AlternationCount}" ItemsSource="{TemplateBinding ItemsSource}">
-							<ItemsControl.Clip>
-								<EllipseGeometry x:Name="PART_EllipseGeometry" Center="200,200" RadiusX="0" RadiusY="0" />
-							</ItemsControl.Clip>
-							<ItemsControl.ItemTemplate>
-								<DataTemplate>
-									<controls:CircularMenuItem Angle="{Binding Angle}" BackgroundColor="{Binding Path=(ItemsControl.AlternationIndex), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.IndexToColor}}" IconImage="{Binding IconImage}" MenuTxt="{Binding MenuTxt}" />
-								</DataTemplate>
-							</ItemsControl.ItemTemplate>
-							<ItemsControl.ItemsPanel>
-								<ItemsPanelTemplate>
-									<controls:SmallPanel />
-								</ItemsPanelTemplate>
-							</ItemsControl.ItemsPanel>
-						</ItemsControl>
-						<ToggleButton x:Name="PART_ToggleButton" Cursor="Hand">
-							<ToggleButton.Template>
-								<ControlTemplate TargetType="ToggleButton">
-									<controls:SmallPanel>
-										<Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
-										<controls:PathIcon x:Name="PART_Path" Width="20" Height="20" Foreground="{StaticResource WD.BackgroundSolidColorBrush}" Kind="Add" RenderTransformOrigin="0.5,0.5" />
-									</controls:SmallPanel>
-									<ControlTemplate.Triggers>
-										<Trigger Property="IsChecked" Value="True">
-											<Setter TargetName="PART_Path" Property="RenderTransform">
-												<Setter.Value>
-													<RotateTransform Angle="45" />
-												</Setter.Value>
-											</Setter>
-										</Trigger>
-									</ControlTemplate.Triggers>
-								</ControlTemplate>
-							</ToggleButton.Template>
-						</ToggleButton>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.CircularMenuItem}" TargetType="{x:Type controls:CircularMenuItem}" />
-	<Style BasedOn="{StaticResource WD.CircularMenu}" TargetType="{x:Type controls:CircularMenu}" />
-	<Style x:Key="WD.CircularProgressBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularProgressBar}">
-		<Setter Property="Maximum" Value="100" />
-		<Setter Property="StrokeThickness" Value="10" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
-					<controls:SmallPanel Width="{Binding ElementName=PART_Path, Path=ActualWidth}" Height="{Binding ElementName=PART_Path, Path=ActualHeight}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<Canvas>
-							<Path x:Name="PART_Path" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BrushStrokeThickness}">
-								<Path.Data>
-									<PathGeometry>
-										<PathFigure x:Name="PART_PathFigure">
-											<ArcSegment x:Name="PART_ArcSegment" IsLargeArc="True" SweepDirection="Clockwise" />
-										</PathFigure>
-									</PathGeometry>
-								</Path.Data>
-							</Path>
-							<Path Stroke="{TemplateBinding Background}" StrokeThickness="{TemplateBinding StrokeThickness}">
-								<Path.Data>
-									<PathGeometry>
-										<PathFigure x:Name="PART_PathFigureAngle">
-											<ArcSegment x:Name="PART_ArcSegmentAngle" IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}" SweepDirection="Clockwise">
-												<ArcSegment.Point>
-													<MultiBinding Converter="{StaticResource WD.PrConverter}">
-														<Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-														<Binding Path="Size" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
-													</MultiBinding>
-												</ArcSegment.Point>
-											</ArcSegment>
-										</PathFigure>
-									</PathGeometry>
-								</Path.Data>
-							</Path>
-						</Canvas>
-						<TextBlock x:Name="PART_TextBlock" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.CircularProgressBar}" TargetType="{x:Type controls:CircularProgressBar}" />
-	<Style x:Key="WD.EdgeLight" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:EdgeLight}">
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="Padding" Value="20" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:EdgeLight}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="EdgeLightStoryboard">
-							<DoubleAnimation Storyboard.TargetName="PART_Top" Storyboard.TargetProperty="ScaleX" To="1" Duration="00:00:0.5" />
-							<DoubleAnimation BeginTime="00:00:0.5" Storyboard.TargetName="PART_Right" Storyboard.TargetProperty="ScaleY" To="1" Duration="00:00:0.5" />
-							<DoubleAnimation BeginTime="00:00:01" Storyboard.TargetName="PART_Bottom" Storyboard.TargetProperty="ScaleX" To="1" Duration="00:00:.5" />
-							<DoubleAnimation BeginTime="00:00:01.5" Storyboard.TargetName="PART_Left" Storyboard.TargetProperty="ScaleY" To="1" Duration="00:00:.5" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel>
-						<DockPanel LastChildFill="False">
-							<Rectangle Height="{TemplateBinding LineSize}" DockPanel.Dock="Top" Fill="{TemplateBinding BorderBrush}">
-								<Rectangle.RenderTransform>
-									<ScaleTransform x:Name="PART_Top" ScaleX="0" />
-								</Rectangle.RenderTransform>
-							</Rectangle>
-							<Rectangle Width="{TemplateBinding LineSize}" DockPanel.Dock="Right" Fill="{TemplateBinding BorderBrush}">
-								<Rectangle.RenderTransform>
-									<ScaleTransform x:Name="PART_Right" ScaleY="0" />
-								</Rectangle.RenderTransform>
-							</Rectangle>
-							<Rectangle Height="{TemplateBinding LineSize}" DockPanel.Dock="Bottom" Fill="{TemplateBinding BorderBrush}" RenderTransformOrigin="1,1">
-								<Rectangle.RenderTransform>
-									<ScaleTransform x:Name="PART_Bottom" ScaleX="0" />
-								</Rectangle.RenderTransform>
-							</Rectangle>
-							<Rectangle Width="{TemplateBinding LineSize}" DockPanel.Dock="Left" Fill="{TemplateBinding BorderBrush}" RenderTransformOrigin="1,1">
-								<Rectangle.RenderTransform>
-									<ScaleTransform x:Name="PART_Left" ScaleY="0" />
-								</Rectangle.RenderTransform>
-							</Rectangle>
-						</DockPanel>
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsAnimation" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="beginAnimation" Storyboard="{StaticResource EdgeLightStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="beginAnimation" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.EdgeLight}" TargetType="{x:Type controls:EdgeLight}" />
-	<Style x:Key="WD.StreamerLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StreamerLoading}">
-		<Setter Property="Width" Value="100" />
-		<Setter Property="Height" Value="100" />
-		<Setter Property="Background">
-			<Setter.Value>
-				<SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
-					<Rectangle x:Name="PART_Rectangle" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" HorizontalAlignment="Center" VerticalAlignment="Center" StrokeThickness="3">
-						<Rectangle.Stroke>
-							<LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
-								<GradientStop Offset="0" Color="Transparent" />
-								<GradientStop Offset="1" Color="{Binding Path=Background.Color, RelativeSource={RelativeSource TemplatedParent}}" />
-							</LinearGradientBrush>
-						</Rectangle.Stroke>
-					</Rectangle>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard>
-								<Storyboard RepeatBehavior="Forever">
-									<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
-										<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
-										<EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
-										<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
-										<EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
-										<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
-									</PointAnimationUsingKeyFrames>
-									<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
-										<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
-										<EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
-										<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
-										<EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
-										<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
-									</PointAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.WaitLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:WaitLoading}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WaitLoading}">
-					<Canvas Width="100" Height="20">
-						<Ellipse x:Name="PART_RedEllipase" Canvas.Left="0" Width="20" Height="20" Fill="{StaticResource WD.DangerSolidColorBrush}" />
-						<Ellipse x:Name="PART_GreenEllipase" Canvas.Left="50" Width="20" Height="20" Fill="{StaticResource WD.SuccessSolidColorBrush}" />
-						<Ellipse x:Name="PART_OrangeEllipase" Canvas.Left="100" Width="20" Height="20" Fill="{StaticResource WD.WarningSolidColorBrush}" />
-					</Canvas>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard>
-								<Storyboard RepeatBehavior="Forever">
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="100" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="0" />
-									</DoubleAnimationUsingKeyFrames>
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="0" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
-									</DoubleAnimationUsingKeyFrames>
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="0" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="100" />
-									</DoubleAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.CycleLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CycleLoading}">
-		<Setter Property="Foreground" Value="White" />
-		<Setter Property="FontSize" Value="30" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CycleLoading}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard_LoadRunning" RepeatBehavior="Forever" SpeedRatio="2">
-							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel>
-						<Viewbox>
-							<controls:SmallPanel Width="400" Height="400">
-								<controls:SmallPanel x:Name="Part_Cycle_Rotate1" RenderTransformOrigin="0.5,0.5">
-									<controls:SmallPanel.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</controls:SmallPanel.RenderTransform>
-									<Ellipse Margin="0,50,0,50">
-										<Ellipse.Fill>
-											<LinearGradientBrush>
-												<GradientStop Offset="0" Color="White" />
-												<GradientStop Offset="1" Color="White" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-										<Ellipse.Effect>
-											<BlurEffect Radius="40" />
-										</Ellipse.Effect>
-									</Ellipse>
-									<Ellipse Margin="50,0,50,0">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-												<GradientStop Offset="0.4" Color="White" />
-												<GradientStop Offset="1" Color="White" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-										<Ellipse.Effect>
-											<BlurEffect Radius="40" />
-										</Ellipse.Effect>
-									</Ellipse>
-								</controls:SmallPanel>
-								<controls:SmallPanel x:Name="Part_Cycle_Rotate" RenderTransformOrigin="0.5,0.5">
-									<controls:SmallPanel.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</controls:SmallPanel.RenderTransform>
-									<Ellipse Margin="0,50,0,50">
-										<Ellipse.Fill>
-											<LinearGradientBrush>
-												<GradientStop Offset="0" Color="#d495f1" />
-												<GradientStop Offset="1" Color="#87d3f7" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-										<Ellipse.Effect>
-											<BlurEffect Radius="15" />
-										</Ellipse.Effect>
-									</Ellipse>
-									<Ellipse Margin="50,0,50,0">
-										<Ellipse.Fill>
-											<LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
-												<GradientStop Offset="0" Color="#f173ac" />
-												<GradientStop Offset="1" Color="#33a3dc" />
-											</LinearGradientBrush>
-										</Ellipse.Fill>
-										<Ellipse.Effect>
-											<BlurEffect Radius="15" />
-										</Ellipse.Effect>
-									</Ellipse>
-								</controls:SmallPanel>
-								<Ellipse Margin="33" Fill="Black">
-									<Ellipse.Effect>
-										<DropShadowEffect BlurRadius="20" ShadowDepth="0" Color="White" />
-									</Ellipse.Effect>
-								</Ellipse>
-							</controls:SmallPanel>
-						</Viewbox>
-						<Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<TextBlock Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" Text="{TemplateBinding LoadTitle}" />
-							<ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-							<TextBlock Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15" Text="{TemplateBinding ValueDescription}" />
-						</Grid>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="Storyboard_LoadRunning" Storyboard="{StaticResource Storyboard_LoadRunning}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="Storyboard_LoadRunning" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.RollLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:RollLoading}">
-		<Setter Property="ForegroundColor" Value="{StaticResource WD.DangerColor}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:RollLoading}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="RollKey" RepeatBehavior="Forever">
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="2" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="4" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="6" Storyboard.TargetName="PART_Border3" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="8" Storyboard.TargetName="PART_Border4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="10" Storyboard.TargetName="PART_Border5" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="12" Storyboard.TargetName="PART_Border6" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="14" Storyboard.TargetName="PART_Border7" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="16" Storyboard.TargetName="PART_Border8" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<ColorAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="ForegroundColor" Duration="0:0:5">
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0" Value="Red" />
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="Blue" />
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="Yellow" />
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="Green" />
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:4" Value="Aqua" />
-								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:5" Value="Red" />
-							</ColorAnimationUsingKeyFrames>
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Viewbox>
-							<controls:SmallPanel>
-								<Border x:Name="PART_Border1" Width="160" Height="160" BorderThickness="0,5,0,0" CornerRadius="80" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border2" Width="140" Height="140" BorderThickness="0,5,0,0" CornerRadius="70" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border3" Width="120" Height="120" BorderThickness="0,5,0,0" CornerRadius="60" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border4" Width="100" Height="100" BorderThickness="0,5,0,0" CornerRadius="50" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border5" Width="80" Height="80" BorderThickness="0,5,0,0" CornerRadius="40" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border6" Width="60" Height="60" BorderThickness="0,5,0,0" CornerRadius="30" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border7" Width="40" Height="40" BorderThickness="0,5,0,0" CornerRadius="20" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-								<Border x:Name="PART_Border8" Width="20" Height="20" BorderThickness="0,5,0,0" CornerRadius="10" RenderTransformOrigin="0.5,0.5">
-									<Border.BorderBrush>
-										<LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
-											<LinearGradientBrush.GradientStops>
-												<GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
-												<GradientStop Offset="0.5" Color="Transparent" />
-											</LinearGradientBrush.GradientStops>
-										</LinearGradientBrush>
-									</Border.BorderBrush>
-									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
-									</Border.RenderTransform>
-								</Border>
-							</controls:SmallPanel>
-						</Viewbox>
-						<ContentPresenter Grid.Row="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource RollKey}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="Roll_Storyboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.RingLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:RingLoading">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="controls:RingLoading">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="PART_Resource_Storyboard" RepeatBehavior="Forever">
-							<DoubleAnimation Storyboard.TargetName="PART_Ring1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="-495" Duration="0:0:1.5" />
-							<DoubleAnimation Storyboard.TargetName="PART_Ring2" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="585" Duration="0:0:1.5" />
-							<DoubleAnimation Storyboard.TargetName="PART_Ring3" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="-315" Duration="0:0:1.5" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<Grid>
-						<Grid.RowDefinitions>
-							<RowDefinition Height="*" />
-							<RowDefinition Height="Auto" />
-						</Grid.RowDefinitions>
-						<Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
-							<Border Width="100" Height="100" Padding="10">
-								<controls:SmallPanel>
-									<controls:SmallPanel x:Name="PART_Ring1" Width="60" Height="60" HorizontalAlignment="Center" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5">
-										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="-135" />
-												<TranslateTransform />
-											</TransformGroup>
-										</controls:SmallPanel.RenderTransform>
-										<Ellipse RenderTransformOrigin="0.5,0.5" Stroke="Red" StrokeDashArray="23 100" StrokeThickness="2" />
-										<Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="Red" CornerRadius="10">
-											<Border.Effect>
-												<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="Red" />
-											</Border.Effect>
-										</Border>
-									</controls:SmallPanel>
-									<controls:SmallPanel x:Name="PART_Ring2" Width="60" Height="60" HorizontalAlignment="Left" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
-										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="225" />
-												<TranslateTransform />
-											</TransformGroup>
-										</controls:SmallPanel.RenderTransform>
-										<Ellipse Stroke="Purple" StrokeDashArray="23 100" StrokeThickness="2" />
-										<Border Width="10" Height="10" Margin="0,0,0,-4" HorizontalAlignment="Center" VerticalAlignment="Bottom" Background="Purple" CornerRadius="10">
-											<Border.Effect>
-												<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="Purple" />
-											</Border.Effect>
-										</Border>
-									</controls:SmallPanel>
-									<controls:SmallPanel x:Name="PART_Ring3" Width="60" Height="60" HorizontalAlignment="Right" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
-										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="45" />
-												<TranslateTransform />
-											</TransformGroup>
-										</controls:SmallPanel.RenderTransform>
-										<Ellipse Stroke="#0fb8b2" StrokeDashArray="23 100" StrokeThickness="2" />
-										<Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="#0fb8b2" CornerRadius="10">
-											<Border.Effect>
-												<DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#0fb8b2" />
-											</Border.Effect>
-										</Border>
-									</controls:SmallPanel>
-								</controls:SmallPanel>
-							</Border>
-						</Viewbox>
-						<StackPanel Grid.Row="1" Grid.ColumnSpan="2" Margin="10">
-							<TextBlock Margin="0,0,0,15" HorizontalAlignment="Center" Text="Loading..." />
-							<TextBlock Margin="0,0,0,15" HorizontalAlignment="Center" Text="{TemplateBinding Description}" />
-							<TextBlock HorizontalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" FontWeight="Bold" Text="{TemplateBinding Progress}" />
-						</StackPanel>
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Resource_Storyboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.StreamerLoading}" TargetType="{x:Type controls:StreamerLoading}" />
-	<Style BasedOn="{StaticResource WD.WaitLoading}" TargetType="{x:Type controls:WaitLoading}" />
-	<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}" />
-	<Style x:Key="WD.PageListBoxStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ListBox}">
-					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-						<ScrollViewer Padding="{TemplateBinding Padding}" Focusable="False">
-							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-						</ScrollViewer>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsGrouping" Value="True">
-							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.PageListBoxItemStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="5,0" />
-		<Setter Property="MinWidth" Value="32" />
-		<Setter Property="Margin" Value="3,0" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ListBoxItem}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" TextElement.Foreground="{TemplateBinding Foreground}" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<DataTrigger Binding="{Binding .}" Value="···">
-				<Setter Property="IsEnabled" Value="False" />
-				<Setter Property="FontWeight" Value="Bold" />
-			</DataTrigger>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
-				<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-				<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsSelected" Value="True">
-				<Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
-				<Setter Property="TextElement.Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<ControlTemplate x:Key="WD.PART_DrawArrow" TargetType="{x:Type Control}">
-		<Grid>
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="15" />
-			</Grid.ColumnDefinitions>
-			<Path Height="8" Margin="0,0,-7,0" HorizontalAlignment="Left" VerticalAlignment="Center" Data="{StaticResource WD.ArrowBranchesGeometry}" Fill="{TemplateBinding Background}" Stretch="Fill" />
-			<Path Grid.Column="1" Width="15" Height="15" Data="{StaticResource WD.ArrowGeometry}" Fill="{TemplateBinding Background}" Stretch="Fill" />
-		</Grid>
-	</ControlTemplate>
-	<Style x:Key="WD.ScreenCutRectangleStyle" TargetType="{x:Type Rectangle}">
-		<Setter Property="Fill" Value="{DynamicResource WD.BlackSolidColorBrush}" />
-		<Setter Property="Opacity" Value=".3" />
-	</Style>
-	<Style x:Key="WD.ScreenCutEllipseStyle" TargetType="{x:Type Ellipse}">
-		<Setter Property="Width" Value="15" />
-		<Setter Property="Height" Value="15" />
-		<Setter Property="Fill" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="StrokeThickness" Value="2" />
-	</Style>
-	<Style x:Key="WD.ScreenCut" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ScreenCut}">
-		<Setter Property="WindowState" Value="Maximized" />
-		<Setter Property="WindowStyle" Value="None" />
-		<Setter Property="ResizeMode" Value="NoResize" />
-		<Setter Property="Topmost" Value="True" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:ScreenCut}">
-					<AdornerDecorator>
-						<Canvas x:Name="PART_Canvas" Width="{Binding Source={x:Static SystemParameters.PrimaryScreenWidth}}" Height="{Binding Source={x:Static SystemParameters.PrimaryScreenHeight}}">
-							<Rectangle x:Name="PART_RectangleLeft" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
-							<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" />
-							<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}}">
-										<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}}">
-										<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}}">
-										<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}}">
-										<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}}">
-										<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}}">
-										<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}}">
-										<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}}">
-										<controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
-									</Button>
-								</WrapPanel>
-							</Border>
-							<Popup x:Name="PART_Popup" AllowsTransparency="True" Placement="Bottom" VerticalOffset="13">
-								<Border x:Name="PART_PopupBorder" Margin="10,30,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ControlsHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}">
-									<controls:SmallPanel>
-										<Path Width="10" Margin="0,-8,0,0" VerticalAlignment="Top" Data="{StaticResource WD.UpperTriangleGeometry}" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" SnapsToDevicePixels="True" Stretch="Uniform" UseLayoutRounding="True" />
-										<WrapPanel x:Name="PART_WrapPanelColor" Margin="10" VerticalAlignment="Center">
-											<RadioButton Margin="4,0" Background="Red" IsChecked="True" Style="{DynamicResource WD.ColorRadioButton}" />
-											<RadioButton Margin="4,0" Background="DodgerBlue" Style="{DynamicResource WD.ColorRadioButton}" />
-											<RadioButton Margin="4,0" Background="LimeGreen" Style="{DynamicResource WD.ColorRadioButton}" />
-											<RadioButton Margin="4,0" Background="Yellow" Style="{DynamicResource WD.ColorRadioButton}" />
-										</WrapPanel>
-									</controls:SmallPanel>
-								</Border>
-							</Popup>
-						</Canvas>
-					</AdornerDecorator>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.ScreenCut}" TargetType="{x:Type controls:ScreenCut}" />
-	<Style x:Key="WD.SpotLight" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SpotLight}">
-		<Setter Property="Background" Value="#222222" />
-		<Setter Property="FontSize" Value="60" />
-		<Setter Property="FontFamily" Value="Arial Black" />
-		<Setter Property="FontWeight" Value="Bold" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:SpotLight}">
-					<controls:SmallPanel x:Name="PART_Canvas" Background="{TemplateBinding Background}">
-						<TextBlock x:Name="PART_TextBlockBottom" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding DefaultForeground}" Text="{TemplateBinding Text}" />
-						<TextBlock x:Name="PART_TextBlockTop" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}">
-							<TextBlock.Clip>
-								<EllipseGeometry x:Name="PART_EllipseGeometry">
-									<EllipseGeometry.Transform>
-										<TranslateTransform />
-									</EllipseGeometry.Transform>
-								</EllipseGeometry>
-							</TextBlock.Clip>
-						</TextBlock>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.SpotLight}" TargetType="{x:Type controls:SpotLight}" />
-	<Style x:Key="WD.DrawerMenuToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="ToggleButton">
-		<Setter Property="IsChecked" Value="False" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type ToggleButton}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="Opacity" Value="0.8" />
-				<Setter Property="Template">
-					<Setter.Value>
-						<ControlTemplate TargetType="{x:Type ToggleButton}">
-							<Border Background="{TemplateBinding Background}" BorderBrush="{StaticResource WD.BlackSolidColorBrush}" BorderThickness="1">
-								<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-							</Border>
-						</ControlTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="ButtonFocusVisual">
-		<Setter Property="Control.Template">
-			<Setter.Value>
-				<ControlTemplate>
-					<Border>
-						<Rectangle Margin="2" Stroke="{StaticResource WD.ButtonFocusVisualColor}" StrokeDashArray="1 2" StrokeThickness="1" />
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DrawerMenuItemButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="Button">
-		<Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />
-		<Setter Property="MinHeight" Value="23" />
-		<Setter Property="Height" Value="44" />
-		<Setter Property="MinWidth" Value="75" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="Button">
-					<Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" CornerRadius="0">
-						<ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RecognizesAccessKey="True" />
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsKeyboardFocused" Value="True">
-							<Setter TargetName="Border" Property="BorderBrush" Value="Transparent " />
-						</Trigger>
-						<Trigger Property="IsDefaulted" Value="True">
-							<Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
-						</Trigger>
-						<Trigger Property="IsPressed" Value="True">
-							<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" />
-							<Setter Property="Foreground" Value="Transparent" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DrawerMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:DrawerMenuItem">
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:DrawerMenu}}, Path=MenuItemForeground}" />
-		<Setter Property="SelectionIndicatorColor" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="controls:DrawerMenuItem">
-					<Button x:Name="PART_Button" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Command="{TemplateBinding SelectionCommand}" Style="{StaticResource WD.DrawerMenuItemButtonStyle}">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="3" />
-								<ColumnDefinition />
-							</Grid.ColumnDefinitions>
-							<Grid Grid.ColumnSpan="2">
-								<Grid Width="300">
-									<Grid.ColumnDefinitions>
-										<ColumnDefinition Width="45" />
-										<ColumnDefinition />
-									</Grid.ColumnDefinitions>
-									<ContentPresenter Grid.Column="0" Margin="10,5,5,5" ContentSource="Icon" />
-									<TextBlock Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" TextWrapping="Wrap" />
-								</Grid>
-							</Grid>
-							<Rectangle x:Name="PART_ItemSelectedIndicator" Grid.Column="0" Fill="{TemplateBinding SelectionIndicatorColor}" Visibility="Collapsed" />
-						</Grid>
-					</Button>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter TargetName="PART_ItemSelectedIndicator" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-						</Trigger>
-						<Trigger SourceName="PART_Button" Property="IsPressed" Value="True">
-							<Trigger.ExitActions>
-								<BeginStoryboard>
-									<Storyboard>
-										<BooleanAnimationUsingKeyFrames Storyboard.TargetProperty="IsSelected">
-											<DiscreteBooleanKeyFrame KeyTime="00:00:00" Value="True" />
-										</BooleanAnimationUsingKeyFrames>
-									</Storyboard>
-								</BeginStoryboard>
-							</Trigger.ExitActions>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.DrawerMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:DrawerMenu">
-		<Setter Property="Width" Value="50" />
-		<Setter Property="IsOpen" Value="True" />
-		<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.RowDefinitions>
-							<RowDefinition Height="Auto" />
-							<RowDefinition />
-						</Grid.RowDefinitions>
-						<ToggleButton x:Name="PART_ToggleButton" Width="50" Height="40" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#333" IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:DrawerMenu}}, Path=IsOpen}" Style="{StaticResource WD.DrawerMenuToggleButton}">
-							<Path x:Name="PART_Path" Width="20" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.MenuGeometry}" Fill="{TemplateBinding MenuIconColor}" Stretch="Uniform" />
-						</ToggleButton>
-						<ItemsPresenter x:Name="ItemsPresenter" Grid.Row="1" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-					</Grid>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsOpen" Value="False">
-							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ReturnGeometry}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsOpen" Value="False">
-				<Trigger.EnterActions>
-					<BeginStoryboard>
-						<Storyboard>
-							<DoubleAnimation Storyboard.TargetProperty="Width" To="180" Duration="0:0:0.2" />
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.EnterActions>
-				<Trigger.ExitActions>
-					<BeginStoryboard>
-						<Storyboard>
-							<DoubleAnimation Storyboard.TargetProperty="Width" To="50" Duration="0:0:0.2" />
-						</Storyboard>
-					</BeginStoryboard>
-				</Trigger.ExitActions>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DrawerMenuItem}" TargetType="{x:Type controls:DrawerMenuItem}" />
-	<Style BasedOn="{StaticResource WD.DrawerMenu}" TargetType="{x:Type controls:DrawerMenu}" />
-	<Style x:Key="WD.CropAvatar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:CropAvatar">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CropAvatar}">
-					<Canvas x:Name="PART_Canvas" ClipToBounds="True">
-						<Image x:Name="PART_Image" Cursor="SizeAll" />
-						<Path x:Name="PART_Layout" Width="200" Height="200" Fill="{DynamicResource WD.BlackSolidColorBrush}" Opacity=".5">
-							<Path.Data>
-								<CombinedGeometry GeometryCombineMode="Xor">
-									<CombinedGeometry.Geometry1>
-										<RectangleGeometry Rect="0,0,200,200" />
-									</CombinedGeometry.Geometry1>
-									<CombinedGeometry.Geometry2>
-										<EllipseGeometry Center="100,100" RadiusX="100" RadiusY="100" />
-									</CombinedGeometry.Geometry2>
-								</CombinedGeometry>
-							</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">
-								<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}}">
-								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
-							</Button>
-						</controls:SmallPanel>
-					</Canvas>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.CropAvatar}" TargetType="{x:Type controls:CropAvatar}" />
-	<Style x:Key="WD.StarrySky" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StarrySky}">
-		<Setter Property="Background" Value="{StaticResource WD.StarrySkyRadialGradientBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:StarrySky}">
-					<controls:SmallPanel Background="{TemplateBinding Background}">
-						<controls:SmallPanel x:Name="PART_GridLineContainer" />
-						<Canvas x:Name="PART_CanvasStarContainer" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.StarrySky}" TargetType="{x:Type controls:StarrySky}" />
-	<Style x:Key="WD.BubblleControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:BubblleControl">
-		<Setter Property="Width" Value="400" />
-		<Setter Property="Height" Value="400" />
-		<Setter Property="Background" Value="{StaticResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{StaticResource WD.SecondaryTextSolidColorBrush}" />
-		<Setter Property="BorderBackground" Value="{StaticResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="controls:BubblleControl">
-					<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-						<Border x:Name="PART_Border" Margin="45" Background="{TemplateBinding BorderBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="400">
-							<Ellipse Margin="20" Fill="{TemplateBinding Background}" />
-						</Border>
-						<Ellipse x:Name="PART_Ellipse" Width="26" Height="26" Margin="0,35,0,0" VerticalAlignment="Top" Fill="{TemplateBinding EarthBackground}" RenderTransformOrigin=".5,.5">
-							<Ellipse.RenderTransform>
-								<RotateTransform x:Name="PART_EllipseRotateTransform" />
-							</Ellipse.RenderTransform>
-							<Ellipse.Triggers>
-								<EventTrigger RoutedEvent="Loaded">
-									<BeginStoryboard>
-										<Storyboard>
-											<DoubleAnimation RepeatBehavior="Forever" Storyboard.TargetProperty="(Ellipse.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="00:00:13" />
-										</Storyboard>
-									</BeginStoryboard>
-								</EventTrigger>
-							</Ellipse.Triggers>
-						</Ellipse>
-						<ItemsControl x:Name="PART_ListBox" ItemsSource="{TemplateBinding ItemsSource}">
-							<ItemsControl.ItemTemplate>
-								<DataTemplate>
-									<controls:SmallPanel>
-										<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-											<Ellipse Fill="{Binding Bg}" Opacity=".4" />
-											<Ellipse Stroke="{Binding Bg}" StrokeThickness=".8" />
-										</controls:SmallPanel>
-										<TextBlock Padding="10,0" HorizontalAlignment="Center" VerticalAlignment="Center">
+                            </TextBlock>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsPlay" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="PlayBeginStoryboard" Storyboard="{StaticResource PlayStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PlayBeginStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsRight" Value="True">
+                            <Setter TargetName="PART_TextBlock" Property="Grid.Column" Value="0" />
+                            <Setter TargetName="PART_TextBlock" Property="HorizontalAlignment" Value="Right" />
+                            <Setter TargetName="PART_StackPanel" Property="Grid.Column" Value="1" />
+                            <Setter TargetName="PART_StackPanel" Property="HorizontalAlignment" Value="Right" />
+                            <Setter TargetName="PART_StackPanel" Property="RenderTransform">
+                                <Setter.Value>
+                                    <TransformGroup>
+                                        <RotateTransform Angle="180" />
+                                    </TransformGroup>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.AnimationAudio}" TargetType="{x:Type controls:AnimationAudio}" />
+    <Style x:Key="WD.AnimationNavigationBar3DItem" BasedOn="{StaticResource WD.ControlBasicStyle}" 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}">
+                    <Viewport3D Width="{TemplateBinding Height}" Height="{TemplateBinding Width}">
+                        <Viewport3D.Triggers>
+                            <EventTrigger RoutedEvent="MouseEnter">
+                                <BeginStoryboard>
+                                    <Storyboard Storyboard.TargetName="axis3d" Storyboard.TargetProperty="Angle">
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" To="90" Duration="00:00:1" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                            <EventTrigger RoutedEvent="MouseLeave">
+                                <BeginStoryboard>
+                                    <Storyboard Storyboard.TargetName="axis3d" Storyboard.TargetProperty="Angle">
+                                        <DoubleAnimation EasingFunction="{StaticResource WD.CubicEaseInOut}" To="0" Duration="00:00:1" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </EventTrigger>
+                        </Viewport3D.Triggers>
+                        <Viewport3D.Camera>
+                            <OrthographicCamera LookDirection="0,0,-100" Position="0,0,100" UpDirection="0,1,0" />
+                        </Viewport3D.Camera>
+                        <Viewport3D.Children>
+                            <ModelVisual3D>
+                                <ModelVisual3D.Content>
+                                    <AmbientLight Color="{DynamicResource WD.BackgroundColor}" />
+                                </ModelVisual3D.Content>
+                            </ModelVisual3D>
+                            <ContainerUIElement3D>
+                                <ContainerUIElement3D.Transform>
+                                    <RotateTransform3D>
+                                        <RotateTransform3D.Rotation>
+                                            <AxisAngleRotation3D x:Name="axis3d" Angle="0" Axis="1 0 0" />
+                                        </RotateTransform3D.Rotation>
+                                    </RotateTransform3D>
+                                </ContainerUIElement3D.Transform>
+                                <Viewport2DVisual3D>
+                                    <Viewport2DVisual3D.Material>
+                                        <DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
+                                    </Viewport2DVisual3D.Material>
+                                    <Viewport2DVisual3D.Geometry>
+                                        <MeshGeometry3D Positions="-1,1,1    -1,-1,1   1,-1,1    1,1,1" TextureCoordinates="0,0   0,1     1,1  1,0" TriangleIndices="0 1 2 0 2 3" />
+                                    </Viewport2DVisual3D.Geometry>
+                                    <Border Width="110" Height="110" Background="{TemplateBinding Background}" CornerRadius="0,0,0,0">
+                                        <ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
+                                    </Border>
+                                </Viewport2DVisual3D>
+                                <Viewport2DVisual3D>
+                                    <Viewport2DVisual3D.Material>
+                                        <DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
+                                    </Viewport2DVisual3D.Material>
+                                    <Viewport2DVisual3D.Geometry>
+                                        <MeshGeometry3D Positions="-1,1,1  1,1,1   1,1,-1   -1,1,-1" TextureCoordinates="0,0   0,1   1,1  1,0" TriangleIndices="0 1 2 0 2 3" />
+                                    </Viewport2DVisual3D.Geometry>
+                                    <Border Width="110" Height="110" Background="{TemplateBinding Fill}" CornerRadius="0,0,0,0" RenderTransformOrigin="0.5,0.5">
+                                        <Border.RenderTransform>
+                                            <TransformGroup>
+                                                <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}" />
+                                    </Border>
+                                </Viewport2DVisual3D>
+                            </ContainerUIElement3D>
+                        </Viewport3D.Children>
+                    </Viewport3D>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.AnimationNavigationBar3D" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:AnimationNavigationBar3D}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:AnimationNavigationBar3D}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
+                            <ItemsPresenter />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Columns="{Binding Items.Count, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3D}}}" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.AnimationNavigationBar3DItem}" TargetType="{x:Type controls:AnimationNavigationBar3DItem}" />
+    <Style BasedOn="{StaticResource WD.AnimationNavigationBar3D}" TargetType="{x:Type controls:AnimationNavigationBar3D}" />
+    <Style x:Key="WD.BallLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BallLoading}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:BallLoading}">
+                    <Viewbox>
+                        <controls:SmallPanel x:Name="Part_BackGrid" Width="400" Height="140">
+                            <controls:SmallPanel.Effect>
+                                <DropShadowEffect BlurRadius="10" Opacity="0.8" ShadowDepth="5" Color="#ff6a27" />
+                            </controls:SmallPanel.Effect>
+                            <Canvas>
+                                <Ellipse x:Name="Part_Eillipse" Canvas.Left="20" Canvas.Top="50" Width="40" Height="40">
+                                    <Ellipse.Fill>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <GradientStop Offset="0" Color="#ff9303" />
+                                            <GradientStop Offset="1" Color="#ff8c09" />
+                                        </LinearGradientBrush>
+                                    </Ellipse.Fill>
+                                </Ellipse>
+                            </Canvas>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <controls:SmallPanel x:Name="Part_EillpseDock1" Grid.Column="1" RenderTransformOrigin="0,0.5">
+                                    <Ellipse x:Name="Part_Eillipse1" Width="40" Height="40" HorizontalAlignment="Center">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <GradientStop Offset="0" Color="#ff781a" />
+                                                <GradientStop Offset="1" Color="#ff6a27" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                                <controls:SmallPanel x:Name="Part_EillpseDock2" Grid.Column="2" RenderTransformOrigin="0,0.5">
+                                    <Ellipse x:Name="Part_Eillipse2" Width="40" Height="40" HorizontalAlignment="Center">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <GradientStop Offset="0" Color="#ff5539" />
+                                                <GradientStop Offset="1" Color="#ff4845" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                                <controls:SmallPanel x:Name="Part_EillpseDock3" Grid.Column="3" RenderTransformOrigin="0,0.5">
+                                    <Ellipse x:Name="Part_Eillipse3" Width="40" Height="40" HorizontalAlignment="Center">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <GradientStop Offset="0" Color="#ff3357" />
+                                                <GradientStop Offset="1" Color="#ff2465" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                                <controls:SmallPanel x:Name="Part_EillpseDock4" Grid.Column="4" RenderTransformOrigin="0,0.5">
+                                    <Ellipse x:Name="Part_Eillipse4" Width="40" Height="40" HorizontalAlignment="Center">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                                <GradientStop Offset="0" Color="#ff097c" />
+                                                <GradientStop Offset="1" Color="#ff0382" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                            </Grid>
+                        </controls:SmallPanel>
+                    </Viewbox>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.BallLoading}" TargetType="{x:Type controls:BallLoading}" />
+    <ControlTemplate x:Key="WD.LampEffectEclipse" TargetType="{x:Type controls:BreathLamp}">
+        <controls:SmallPanel>
+            <Viewbox>
+                <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                    <Border x:Name="PART_LampEclipse" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="0" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
+                        <Border.RenderTransform>
+                            <ScaleTransform CenterX="0" CenterY="0" ScaleX="0.8" ScaleY="0.8" />
+                        </Border.RenderTransform>
+                    </Border>
+                </controls:SmallPanel>
+            </Viewbox>
+            <ContentPresenter />
+        </controls:SmallPanel>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsLampStart" Value="True">
+                <Setter TargetName="PART_LampEclipse" Property="Effect">
+                    <Setter.Value>
+                        <DropShadowEffect BlurRadius="25" ShadowDepth="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EffectColor}" />
+                    </Setter.Value>
+                </Setter>
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard AutoReverse="True" RepeatBehavior="Forever">
+                            <DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampEclipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.1" Duration="0:0:1" />
+                            <DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampEclipse" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.1" Duration="0:0:1" />
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.LampEffectRipple" TargetType="{x:Type controls:BreathLamp}">
+        <controls:SmallPanel>
+            <Viewbox>
+                <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                    <Border x:Name="PART_LampRipple_1" Background="Transparent" BorderBrush="{TemplateBinding Background}" BorderThickness="1" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
+                        <Border.RenderTransform>
+                            <ScaleTransform CenterX="0" CenterY="0" ScaleX="0.8" ScaleY="0.8" />
+                        </Border.RenderTransform>
+                    </Border>
+                    <Border x:Name="PART_LampRipple_2" Background="Transparent" BorderBrush="{TemplateBinding Background}" BorderThickness="1" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
+                        <Border.RenderTransform>
+                            <ScaleTransform ScaleX="0.8" ScaleY="0.8" />
+                        </Border.RenderTransform>
+                    </Border>
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" />
+                </controls:SmallPanel>
+            </Viewbox>
+            <ContentPresenter />
+        </controls:SmallPanel>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsLampStart" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard AutoReverse="True" RepeatBehavior="Forever">
+                            <DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_1" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.3" Duration="0:0:1" />
+                            <DoubleAnimation BeginTime="0" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_1" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.3" Duration="0:0:1" />
+                            <DoubleAnimation BeginTime="0:0:0.4" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_2" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)" From="0.8" To="1.3" Duration="0:0:1" />
+                            <DoubleAnimation BeginTime="0:0:0.4" EasingFunction="{StaticResource WD.SineEaseOut}" Storyboard.TargetName="PART_LampRipple_2" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0.8" To="1.3" Duration="0:0:1" />
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <ControlTemplate x:Key="WD.LampEffectOuterGlow" TargetType="{x:Type controls:BreathLamp}">
+        <controls:SmallPanel>
+            <Viewbox>
+                <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                    <Border x:Name="PART_LampOuterGlow" Margin="1" Background="{TemplateBinding Background}" BorderBrush="Transparent" BorderThickness="0" CornerRadius="{TemplateBinding CornerRadius}" RenderTransformOrigin="0.5,0.5">
+                        <Border.Effect>
+                            <DropShadowEffect x:Name="PART_LampOuterGlow_Effect" BlurRadius="0" ShadowDepth="0" Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=EffectColor}" />
+                        </Border.Effect>
+                    </Border>
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" />
+                </controls:SmallPanel>
+            </Viewbox>
+            <ContentPresenter />
+        </controls:SmallPanel>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsLampStart" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard RepeatBehavior="Forever">
+                            <DoubleAnimation AutoReverse="True" BeginTime="0" EasingFunction="{StaticResource WD.SineEaseInOut}" Storyboard.TargetName="PART_LampOuterGlow_Effect" Storyboard.TargetProperty="BlurRadius" From="0" To="40" Duration="0:0:0.6" />
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="WD.BreathLamp" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreathLamp}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Height" Value="60" />
+        <Setter Property="Width" Value="60" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="EffectColor" Value="{StaticResource WD.PrimaryNormalColor}" />
+        <Style.Triggers>
+            <Trigger Property="LampEffect" Value="Eclipse">
+                <Setter Property="Template" Value="{StaticResource WD.LampEffectEclipse}" />
+            </Trigger>
+            <Trigger Property="LampEffect" Value="Ripple">
+                <Setter Property="Template" Value="{StaticResource WD.LampEffectRipple}" />
+            </Trigger>
+            <Trigger Property="LampEffect" Value="OuterGlow">
+                <Setter Property="Template" Value="{StaticResource WD.LampEffectOuterGlow}" />
+            </Trigger>
+            <Trigger Property="LampEffect" Value="Streamer">
+                <Setter Property="Template" Value="{StaticResource WD.LampEffectStreamer}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.BreathLamp}" TargetType="{x:Type controls:BreathLamp}" />
+    <Style x:Key="WD.MasterCarousel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MasterCarousel}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MasterCarousel}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <Viewbox>
+                            <Canvas x:Name="PART_ContentDock" Width="900" Height="400" />
+                        </Viewbox>
+                        <StackPanel x:Name="PART_ButtonDock" Margin="0,210,0,0" HorizontalAlignment="Center" VerticalAlignment="Center" Orientation="Horizontal" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.EmphasizerCarousel" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:EmphasizerCarousel}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:EmphasizerCarousel}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <Canvas x:Name="PART_BackCanvas" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.EmphasizerCarousel}" TargetType="{x:Type controls:EmphasizerCarousel}" />
+    <Style BasedOn="{StaticResource WD.MasterCarousel}" TargetType="{x:Type controls:MasterCarousel}" />
+    <Style x:Key="WD.VerifyCode" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:VerifyCode}">
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="Width" Value="100" />
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:VerifyCode}">
+                    <Image x:Name="PART_Image" Source="{TemplateBinding ImageSource}" Stretch="Fill" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.VerifyCode}" TargetType="{x:Type controls:VerifyCode}" />
+    <Style x:Key="WD.CircularMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularMenuItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircularMenuItem}">
+                    <controls:SmallPanel VerticalAlignment="Top">
+                        <controls:SmallPanel.RenderTransform>
+                            <RotateTransform x:Name="PART_RotateTransform" Angle="{TemplateBinding Angle}" CenterX="200" CenterY="200" />
+                        </controls:SmallPanel.RenderTransform>
+                        <Path x:Name="PART_Path" VerticalAlignment="Center" Data="{StaticResource WD.CircularGeometry}" Fill="{TemplateBinding BackgroundColor}" />
+                        <Image Width="40" Height="40" Margin="60,100,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" RenderTransformOrigin="0.5,0.5" Source="{TemplateBinding IconImage}">
+                            <Image.RenderTransform>
+                                <RotateTransform Angle="-70" />
+                            </Image.RenderTransform>
+                        </Image>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.CircularMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularMenu}">
+        <Setter Property="Width" Value="400" />
+        <Setter Property="Height" Value="400" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircularMenu}">
+                    <controls:SmallPanel>
+                        <ItemsControl x:Name="PART_ItemsControl" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" AlternationCount="{TemplateBinding AlternationCount}" ItemsSource="{TemplateBinding ItemsSource}">
+                            <ItemsControl.Clip>
+                                <EllipseGeometry x:Name="PART_EllipseGeometry" Center="200,200" RadiusX="0" RadiusY="0" />
+                            </ItemsControl.Clip>
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <controls:CircularMenuItem Angle="{Binding Angle}" BackgroundColor="{Binding Path=(ItemsControl.AlternationIndex), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.IndexToColor}}" IconImage="{Binding IconImage}" MenuTxt="{Binding MenuTxt}" />
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <controls:SmallPanel />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                        <ToggleButton x:Name="PART_ToggleButton" Cursor="Hand">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <controls:SmallPanel>
+                                        <Ellipse x:Name="PART_Ellipse" Width="100" Height="100" Fill="{StaticResource WD.PrimaryNormalSolidColorBrush}" />
+                                        <controls:PathIcon x:Name="PART_Path" Width="20" Height="20" Foreground="{StaticResource WD.BackgroundSolidColorBrush}" Kind="Add" RenderTransformOrigin="0.5,0.5" />
+                                    </controls:SmallPanel>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsChecked" Value="True">
+                                            <Setter TargetName="PART_Path" Property="RenderTransform">
+                                                <Setter.Value>
+                                                    <RotateTransform Angle="45" />
+                                                </Setter.Value>
+                                            </Setter>
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                        </ToggleButton>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.CircularMenuItem}" TargetType="{x:Type controls:CircularMenuItem}" />
+    <Style BasedOn="{StaticResource WD.CircularMenu}" TargetType="{x:Type controls:CircularMenu}" />
+    <Style x:Key="WD.CircularProgressBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CircularProgressBar}">
+        <Setter Property="Maximum" Value="100" />
+        <Setter Property="StrokeThickness" Value="10" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.InfoSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CircularProgressBar}">
+                    <controls:SmallPanel Width="{Binding ElementName=PART_Path, Path=ActualWidth}" Height="{Binding ElementName=PART_Path, Path=ActualHeight}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
+                        <Canvas>
+                            <Path x:Name="PART_Path" Stroke="{TemplateBinding BorderBrush}" StrokeThickness="{TemplateBinding BrushStrokeThickness}">
+                                <Path.Data>
+                                    <PathGeometry>
+                                        <PathFigure x:Name="PART_PathFigure">
+                                            <ArcSegment x:Name="PART_ArcSegment" IsLargeArc="True" SweepDirection="Clockwise" />
+                                        </PathFigure>
+                                    </PathGeometry>
+                                </Path.Data>
+                            </Path>
+                            <Path Stroke="{TemplateBinding Background}" StrokeThickness="{TemplateBinding StrokeThickness}">
+                                <Path.Data>
+                                    <PathGeometry>
+                                        <PathFigure x:Name="PART_PathFigureAngle">
+                                            <ArcSegment x:Name="PART_ArcSegmentAngle" IsLargeArc="{Binding Path=Angle, Converter={StaticResource WD.IsLargeConverter}, RelativeSource={RelativeSource FindAncestor, AncestorType=ProgressBar}}" SweepDirection="Clockwise">
+                                                <ArcSegment.Point>
+                                                    <MultiBinding Converter="{StaticResource WD.PrConverter}">
+                                                        <Binding Path="Angle" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
+                                                        <Binding Path="Size" RelativeSource="{RelativeSource FindAncestor, AncestorType=ProgressBar}" />
+                                                    </MultiBinding>
+                                                </ArcSegment.Point>
+                                            </ArcSegment>
+                                        </PathFigure>
+                                    </PathGeometry>
+                                </Path.Data>
+                            </Path>
+                        </Canvas>
+                        <TextBlock x:Name="PART_TextBlock" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{Binding Path=Value, StringFormat={}{0}%, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.CircularProgressBar}" TargetType="{x:Type controls:CircularProgressBar}" />
+    <Style x:Key="WD.EdgeLight" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:EdgeLight}">
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="Padding" Value="20" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:EdgeLight}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="EdgeLightStoryboard">
+                            <DoubleAnimation Storyboard.TargetName="PART_Top" Storyboard.TargetProperty="ScaleX" To="1" Duration="00:00:0.5" />
+                            <DoubleAnimation BeginTime="00:00:0.5" Storyboard.TargetName="PART_Right" Storyboard.TargetProperty="ScaleY" To="1" Duration="00:00:0.5" />
+                            <DoubleAnimation BeginTime="00:00:01" Storyboard.TargetName="PART_Bottom" Storyboard.TargetProperty="ScaleX" To="1" Duration="00:00:.5" />
+                            <DoubleAnimation BeginTime="00:00:01.5" Storyboard.TargetName="PART_Left" Storyboard.TargetProperty="ScaleY" To="1" Duration="00:00:.5" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel>
+                        <DockPanel LastChildFill="False">
+                            <Rectangle Height="{TemplateBinding LineSize}" DockPanel.Dock="Top" Fill="{TemplateBinding BorderBrush}">
+                                <Rectangle.RenderTransform>
+                                    <ScaleTransform x:Name="PART_Top" ScaleX="0" />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <Rectangle Width="{TemplateBinding LineSize}" DockPanel.Dock="Right" Fill="{TemplateBinding BorderBrush}">
+                                <Rectangle.RenderTransform>
+                                    <ScaleTransform x:Name="PART_Right" ScaleY="0" />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <Rectangle Height="{TemplateBinding LineSize}" DockPanel.Dock="Bottom" Fill="{TemplateBinding BorderBrush}" RenderTransformOrigin="1,1">
+                                <Rectangle.RenderTransform>
+                                    <ScaleTransform x:Name="PART_Bottom" ScaleX="0" />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                            <Rectangle Width="{TemplateBinding LineSize}" DockPanel.Dock="Left" Fill="{TemplateBinding BorderBrush}" RenderTransformOrigin="1,1">
+                                <Rectangle.RenderTransform>
+                                    <ScaleTransform x:Name="PART_Left" ScaleY="0" />
+                                </Rectangle.RenderTransform>
+                            </Rectangle>
+                        </DockPanel>
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsAnimation" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="beginAnimation" Storyboard="{StaticResource EdgeLightStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="beginAnimation" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.EdgeLight}" TargetType="{x:Type controls:EdgeLight}" />
+    <Style x:Key="WD.WaitLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:WaitLoading}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:WaitLoading}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="100" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="0" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="0" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
+                            </DoubleAnimationUsingKeyFrames>
+                            <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
+                                <EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="0" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
+                                <EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="100" />
+                            </DoubleAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Canvas Width="100" Height="20" CacheMode="BitmapCache">
+                        <Ellipse x:Name="PART_RedEllipase" Canvas.Left="0" Width="20" Height="20" Fill="{StaticResource WD.DangerSolidColorBrush}" />
+                        <Ellipse x:Name="PART_GreenEllipase" Canvas.Left="50" Width="20" Height="20" Fill="{StaticResource WD.SuccessSolidColorBrush}" />
+                        <Ellipse x:Name="PART_OrangeEllipase" Canvas.Left="100" Width="20" Height="20" Fill="{StaticResource WD.WarningSolidColorBrush}" />
+                    </Canvas>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsLoading" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.CycleLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CycleLoading}">
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="FontSize" Value="30" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CycleLoading}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Storyboard_LoadRunning" DesiredFrameRate="30" RepeatBehavior="Forever" SpeedRatio="2">
+                            <DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel CacheMode="BitmapCache">
+                        <Viewbox>
+                            <controls:SmallPanel Width="400" Height="400">
+                                <controls:SmallPanel x:Name="Part_Cycle_Rotate1" RenderTransformOrigin="0.5,0.5">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <RotateTransform />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Ellipse Margin="0,50,0,50">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush>
+                                                <GradientStop Offset="0" Color="White" />
+                                                <GradientStop Offset="1" Color="White" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                        <Ellipse.Effect>
+                                            <BlurEffect Radius="40" />
+                                        </Ellipse.Effect>
+                                    </Ellipse>
+                                    <Ellipse Margin="50,0,50,0">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                                <GradientStop Offset="0.4" Color="White" />
+                                                <GradientStop Offset="1" Color="White" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                        <Ellipse.Effect>
+                                            <BlurEffect Radius="40" />
+                                        </Ellipse.Effect>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                                <controls:SmallPanel x:Name="Part_Cycle_Rotate" RenderTransformOrigin="0.5,0.5">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <RotateTransform />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Ellipse Margin="0,50,0,50">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush>
+                                                <GradientStop Offset="0" Color="#d495f1" />
+                                                <GradientStop Offset="1" Color="#87d3f7" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                        <Ellipse.Effect>
+                                            <BlurEffect Radius="15" />
+                                        </Ellipse.Effect>
+                                    </Ellipse>
+                                    <Ellipse Margin="50,0,50,0">
+                                        <Ellipse.Fill>
+                                            <LinearGradientBrush StartPoint="0,0" EndPoint="0,1">
+                                                <GradientStop Offset="0" Color="#f173ac" />
+                                                <GradientStop Offset="1" Color="#33a3dc" />
+                                            </LinearGradientBrush>
+                                        </Ellipse.Fill>
+                                        <Ellipse.Effect>
+                                            <BlurEffect Radius="15" />
+                                        </Ellipse.Effect>
+                                    </Ellipse>
+                                </controls:SmallPanel>
+                                <Ellipse Margin="33" Fill="Black">
+                                    <Ellipse.Effect>
+                                        <DropShadowEffect BlurRadius="20" ShadowDepth="0" Color="White" />
+                                    </Ellipse.Effect>
+                                </Ellipse>
+                            </controls:SmallPanel>
+                        </Viewbox>
+                        <Grid HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <TextBlock Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="20" Text="{TemplateBinding LoadTitle}" />
+                            <ContentPresenter Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                            <TextBlock Grid.Row="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="15" Text="{TemplateBinding ValueDescription}" />
+                        </Grid>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsLoading" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="Storyboard_LoadRunning" Storyboard="{StaticResource Storyboard_LoadRunning}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="Storyboard_LoadRunning" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.RollLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:RollLoading}">
+        <Setter Property="ForegroundColor" Value="{StaticResource WD.DangerColor}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:RollLoading}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="2" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="4" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="6" Storyboard.TargetName="PART_Border3" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="8" Storyboard.TargetName="PART_Border4" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="10" Storyboard.TargetName="PART_Border5" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="12" Storyboard.TargetName="PART_Border6" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="14" Storyboard.TargetName="PART_Border7" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="16" Storyboard.TargetName="PART_Border8" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+                            <ColorAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="ForegroundColor" Duration="0:0:5">
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0" Value="Red" />
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="Blue" />
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="Yellow" />
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="Green" />
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:4" Value="Aqua" />
+                                <EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:5" Value="Red" />
+                            </ColorAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid CacheMode="BitmapCache">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Viewbox>
+                            <controls:SmallPanel>
+                                <Border x:Name="PART_Border1" Width="160" Height="160" BorderThickness="0,5,0,0" CornerRadius="80" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border2" Width="140" Height="140" BorderThickness="0,5,0,0" CornerRadius="70" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border3" Width="120" Height="120" BorderThickness="0,5,0,0" CornerRadius="60" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border4" Width="100" Height="100" BorderThickness="0,5,0,0" CornerRadius="50" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border5" Width="80" Height="80" BorderThickness="0,5,0,0" CornerRadius="40" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border6" Width="60" Height="60" BorderThickness="0,5,0,0" CornerRadius="30" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border7" Width="40" Height="40" BorderThickness="0,5,0,0" CornerRadius="20" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                                <Border x:Name="PART_Border8" Width="20" Height="20" BorderThickness="0,5,0,0" CornerRadius="10" RenderTransformOrigin="0.5,0.5">
+                                    <Border.BorderBrush>
+                                        <LinearGradientBrush StartPoint="0,0" EndPoint="1,1">
+                                            <LinearGradientBrush.GradientStops>
+                                                <GradientStop Offset="0.5" Color="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=ForegroundColor}" />
+                                                <GradientStop Offset="0.5" Color="Transparent" />
+                                            </LinearGradientBrush.GradientStops>
+                                        </LinearGradientBrush>
+                                    </Border.BorderBrush>
+                                    <Border.RenderTransform>
+                                        <RotateTransform />
+                                    </Border.RenderTransform>
+                                </Border>
+                            </controls:SmallPanel>
+                        </Viewbox>
+                        <ContentPresenter Grid.Row="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsLoading" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource PART_Storyboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="Roll_Storyboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.RingLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:RingLoading">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:RingLoading">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+                            <DoubleAnimation Storyboard.TargetName="PART_Ring1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="-495" Duration="0:0:1.5" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Ring2" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="585" Duration="0:0:1.5" />
+                            <DoubleAnimation Storyboard.TargetName="PART_Ring3" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="-315" Duration="0:0:1.5" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <Grid CacheMode="BitmapCache">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
+                            <Border Width="100" Height="100" Padding="10">
+                                <controls:SmallPanel>
+                                    <controls:SmallPanel x:Name="PART_Ring1" Width="60" Height="60" HorizontalAlignment="Center" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5">
+                                        <controls:SmallPanel.RenderTransform>
+                                            <RotateTransform Angle="-135" />
+                                        </controls:SmallPanel.RenderTransform>
+                                        <Ellipse RenderTransformOrigin="0.5,0.5" Stroke="Red" StrokeDashArray="23 100" StrokeThickness="2" />
+                                        <Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="Red" CornerRadius="10">
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="Red" />
+                                            </Border.Effect>
+                                        </Border>
+                                    </controls:SmallPanel>
+                                    <controls:SmallPanel x:Name="PART_Ring2" Width="60" Height="60" HorizontalAlignment="Left" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
+                                        <controls:SmallPanel.RenderTransform>
+                                            <RotateTransform Angle="225" />
+                                        </controls:SmallPanel.RenderTransform>
+                                        <Ellipse Stroke="Purple" StrokeDashArray="23 100" StrokeThickness="2" />
+                                        <Border Width="10" Height="10" Margin="0,0,0,-4" HorizontalAlignment="Center" VerticalAlignment="Bottom" Background="Purple" CornerRadius="10">
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="Purple" />
+                                            </Border.Effect>
+                                        </Border>
+                                    </controls:SmallPanel>
+                                    <controls:SmallPanel x:Name="PART_Ring3" Width="60" Height="60" HorizontalAlignment="Right" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
+                                        <controls:SmallPanel.RenderTransform>
+                                            <RotateTransform Angle="45" />
+                                        </controls:SmallPanel.RenderTransform>
+                                        <Ellipse Stroke="#0fb8b2" StrokeDashArray="23 100" StrokeThickness="2" />
+                                        <Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="#0fb8b2" CornerRadius="10">
+                                            <Border.Effect>
+                                                <DropShadowEffect BlurRadius="10" ShadowDepth="0" Color="#0fb8b2" />
+                                            </Border.Effect>
+                                        </Border>
+                                    </controls:SmallPanel>
+                                </controls:SmallPanel>
+                            </Border>
+                        </Viewbox>
+                        <StackPanel Grid.Row="1" Grid.ColumnSpan="2" Margin="10">
+                            <TextBlock Margin="0,0,0,15" HorizontalAlignment="Center" Text="Loading..." />
+                            <TextBlock Margin="0,0,0,15" HorizontalAlignment="Center" Text="{TemplateBinding Description}" />
+                            <TextBlock HorizontalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" FontWeight="Bold" Text="{TemplateBinding Progress}" />
+                        </StackPanel>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsLoading" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.WaitLoading}" TargetType="{x:Type controls:WaitLoading}" />
+    <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}" />
+    <Style x:Key="WD.PageListBoxStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBox}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                        <ScrollViewer Padding="{TemplateBinding Padding}" Focusable="False">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsGrouping" Value="True">
+                            <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.PageListBoxItemStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="5,0" />
+        <Setter Property="MinWidth" Value="32" />
+        <Setter Property="Margin" Value="3,0" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+                        <ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding .}" Value="···">
+                <Setter Property="IsEnabled" Value="False" />
+                <Setter Property="FontWeight" Value="Bold" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBorderBrushSolidColorBrush}" />
+                <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <ControlTemplate x:Key="WD.PART_DrawArrow" TargetType="{x:Type Control}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="15" />
+            </Grid.ColumnDefinitions>
+            <Path Height="8" Margin="0,0,-7,0" HorizontalAlignment="Left" VerticalAlignment="Center" Data="{StaticResource WD.ArrowBranchesGeometry}" Fill="{TemplateBinding Background}" Stretch="Fill" />
+            <Path Grid.Column="1" Width="15" Height="15" Data="{StaticResource WD.ArrowGeometry}" Fill="{TemplateBinding Background}" Stretch="Fill" />
+        </Grid>
+    </ControlTemplate>
+    <Style x:Key="WD.ScreenCutRectangleStyle" TargetType="{x:Type Rectangle}">
+        <Setter Property="Fill" Value="{DynamicResource WD.BlackSolidColorBrush}" />
+        <Setter Property="Opacity" Value=".3" />
+    </Style>
+    <Style x:Key="WD.ScreenCutEllipseStyle" TargetType="{x:Type Ellipse}">
+        <Setter Property="Width" Value="15" />
+        <Setter Property="Height" Value="15" />
+        <Setter Property="Fill" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Stroke" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="StrokeThickness" Value="2" />
+    </Style>
+    <Style x:Key="WD.ScreenCut" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ScreenCut}">
+        <Setter Property="WindowState" Value="Maximized" />
+        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="ResizeMode" Value="NoResize" />
+        <Setter Property="Topmost" Value="True" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:ScreenCut}">
+                    <AdornerDecorator>
+                        <Canvas x:Name="PART_Canvas" Width="{Binding Source={x:Static SystemParameters.PrimaryScreenWidth}}" Height="{Binding Source={x:Static SystemParameters.PrimaryScreenHeight}}">
+                            <Rectangle x:Name="PART_RectangleLeft" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
+                            <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" />
+                            <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <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}}">
+                                        <controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
+                                    </Button>
+                                </WrapPanel>
+                            </Border>
+                            <Popup x:Name="PART_Popup" AllowsTransparency="True" Placement="Bottom" VerticalOffset="13">
+                                <Border x:Name="PART_PopupBorder" Margin="10,30,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ControlsHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}">
+                                    <controls:SmallPanel>
+                                        <Path Width="10" Margin="0,-8,0,0" VerticalAlignment="Top" Data="{StaticResource WD.UpperTriangleGeometry}" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" SnapsToDevicePixels="True" Stretch="Uniform" UseLayoutRounding="True" />
+                                        <WrapPanel x:Name="PART_WrapPanelColor" Margin="10" VerticalAlignment="Center">
+                                            <RadioButton Margin="4,0" Background="Red" IsChecked="True" Style="{DynamicResource WD.ColorRadioButton}" />
+                                            <RadioButton Margin="4,0" Background="DodgerBlue" Style="{DynamicResource WD.ColorRadioButton}" />
+                                            <RadioButton Margin="4,0" Background="LimeGreen" Style="{DynamicResource WD.ColorRadioButton}" />
+                                            <RadioButton Margin="4,0" Background="Yellow" Style="{DynamicResource WD.ColorRadioButton}" />
+                                        </WrapPanel>
+                                    </controls:SmallPanel>
+                                </Border>
+                            </Popup>
+                        </Canvas>
+                    </AdornerDecorator>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.ScreenCut}" TargetType="{x:Type controls:ScreenCut}" />
+    <Style x:Key="WD.SpotLight" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SpotLight}">
+        <Setter Property="Background" Value="#222222" />
+        <Setter Property="FontSize" Value="60" />
+        <Setter Property="FontFamily" Value="Arial Black" />
+        <Setter Property="FontWeight" Value="Bold" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:SpotLight}">
+                    <controls:SmallPanel x:Name="PART_Canvas" Background="{TemplateBinding Background}">
+                        <TextBlock x:Name="PART_TextBlockBottom" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding DefaultForeground}" Text="{TemplateBinding Text}" />
+                        <TextBlock x:Name="PART_TextBlockTop" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" FontWeight="{TemplateBinding FontWeight}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}">
+                            <TextBlock.Clip>
+                                <EllipseGeometry x:Name="PART_EllipseGeometry">
+                                    <EllipseGeometry.Transform>
+                                        <TranslateTransform />
+                                    </EllipseGeometry.Transform>
+                                </EllipseGeometry>
+                            </TextBlock.Clip>
+                        </TextBlock>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.SpotLight}" TargetType="{x:Type controls:SpotLight}" />
+    <Style x:Key="WD.DrawerMenuToggleButton" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="ToggleButton">
+        <Setter Property="IsChecked" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Opacity" Value="0.8" />
+                <Setter Property="Template">
+                    <Setter.Value>
+                        <ControlTemplate TargetType="{x:Type ToggleButton}">
+                            <Border Background="{TemplateBinding Background}" BorderBrush="{StaticResource WD.BlackSolidColorBrush}" BorderThickness="1">
+                                <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                            </Border>
+                        </ControlTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="ButtonFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border>
+                        <Rectangle Margin="2" Stroke="{StaticResource WD.ButtonFocusVisualColor}" StrokeDashArray="1 2" StrokeThickness="1" />
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DrawerMenuItemButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="Button">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />
+        <Setter Property="MinHeight" Value="23" />
+        <Setter Property="Height" Value="44" />
+        <Setter Property="MinWidth" Value="75" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" CornerRadius="0">
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" RecognizesAccessKey="True" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent " />
+                        </Trigger>
+                        <Trigger Property="IsDefaulted" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <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" />
+                            <Setter Property="Foreground" Value="Transparent" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DrawerMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:DrawerMenuItem">
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:DrawerMenu}}, Path=MenuItemForeground}" />
+        <Setter Property="SelectionIndicatorColor" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:DrawerMenuItem">
+                    <Button x:Name="PART_Button" HorizontalContentAlignment="Stretch" VerticalContentAlignment="Stretch" Command="{TemplateBinding SelectionCommand}" Style="{StaticResource WD.DrawerMenuItemButtonStyle}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="3" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <Grid Grid.ColumnSpan="2">
+                                <Grid Width="300">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="45" />
+                                        <ColumnDefinition />
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter Grid.Column="0" Margin="10,5,5,5" ContentSource="Icon" />
+                                    <TextBlock Grid.Column="1" Margin="10,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Text}" TextWrapping="Wrap" />
+                                </Grid>
+                            </Grid>
+                            <Rectangle x:Name="PART_ItemSelectedIndicator" Grid.Column="0" Fill="{TemplateBinding SelectionIndicatorColor}" Visibility="Collapsed" />
+                        </Grid>
+                    </Button>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Button" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter TargetName="PART_ItemSelectedIndicator" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Button" Property="IsPressed" Value="True">
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <BooleanAnimationUsingKeyFrames Storyboard.TargetProperty="IsSelected">
+                                            <DiscreteBooleanKeyFrame KeyTime="00:00:00" Value="True" />
+                                        </BooleanAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.DrawerMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:DrawerMenu">
+        <Setter Property="Width" Value="50" />
+        <Setter Property="IsOpen" Value="True" />
+        <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.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <ToggleButton x:Name="PART_ToggleButton" Width="50" Height="40" HorizontalAlignment="Left" VerticalAlignment="Top" Background="#333" IsChecked="{Binding RelativeSource={RelativeSource AncestorType={x:Type controls:DrawerMenu}}, Path=IsOpen}" Style="{StaticResource WD.DrawerMenuToggleButton}">
+                            <Path x:Name="PART_Path" Width="20" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.MenuGeometry}" Fill="{TemplateBinding MenuIconColor}" Stretch="Uniform" />
+                        </ToggleButton>
+                        <ItemsPresenter x:Name="ItemsPresenter" Grid.Row="1" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsOpen" Value="False">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ReturnGeometry}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsOpen" Value="False">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetProperty="Width" To="180" Duration="0:0:0.2" />
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation Storyboard.TargetProperty="Width" To="50" Duration="0:0:0.2" />
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.ExitActions>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DrawerMenuItem}" TargetType="{x:Type controls:DrawerMenuItem}" />
+    <Style BasedOn="{StaticResource WD.DrawerMenu}" TargetType="{x:Type controls:DrawerMenu}" />
+    <Style x:Key="WD.CropAvatar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:CropAvatar">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CropAvatar}">
+                    <Canvas x:Name="PART_Canvas" ClipToBounds="True">
+                        <Image x:Name="PART_Image" Cursor="SizeAll" />
+                        <Path x:Name="PART_Layout" Width="200" Height="200" Fill="{DynamicResource WD.BlackSolidColorBrush}" Opacity=".5">
+                            <Path.Data>
+                                <CombinedGeometry GeometryCombineMode="Xor">
+                                    <CombinedGeometry.Geometry1>
+                                        <RectangleGeometry Rect="0,0,200,200" />
+                                    </CombinedGeometry.Geometry1>
+                                    <CombinedGeometry.Geometry2>
+                                        <EllipseGeometry Center="100,100" RadiusX="100" RadiusY="100" />
+                                    </CombinedGeometry.Geometry2>
+                                </CombinedGeometry>
+                            </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">
+                                <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}}">
+                                <controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
+                            </Button>
+                        </controls:SmallPanel>
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.CropAvatar}" TargetType="{x:Type controls:CropAvatar}" />
+    <Style x:Key="WD.StarrySky" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StarrySky}">
+        <Setter Property="Background" Value="{StaticResource WD.StarrySkyRadialGradientBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:StarrySky}">
+                    <controls:SmallPanel Background="{TemplateBinding Background}">
+                        <controls:SmallPanel x:Name="PART_GridLineContainer" />
+                        <Canvas x:Name="PART_CanvasStarContainer" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.StarrySky}" TargetType="{x:Type controls:StarrySky}" />
+    <Style x:Key="WD.BubblleControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="controls:BubblleControl">
+        <Setter Property="Width" Value="400" />
+        <Setter Property="Height" Value="400" />
+        <Setter Property="Background" Value="{StaticResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{StaticResource WD.SecondaryTextSolidColorBrush}" />
+        <Setter Property="BorderBackground" Value="{StaticResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:BubblleControl">
+                    <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Border x:Name="PART_Border" Margin="45" Background="{TemplateBinding BorderBackground}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="400">
+                            <Ellipse Margin="20" Fill="{TemplateBinding Background}" />
+                        </Border>
+                        <Ellipse x:Name="PART_Ellipse" Width="26" Height="26" Margin="0,35,0,0" VerticalAlignment="Top" Fill="{TemplateBinding EarthBackground}" RenderTransformOrigin=".5,.5">
+                            <Ellipse.RenderTransform>
+                                <RotateTransform x:Name="PART_EllipseRotateTransform" />
+                            </Ellipse.RenderTransform>
+                            <Ellipse.Triggers>
+                                <EventTrigger RoutedEvent="Loaded">
+                                    <BeginStoryboard>
+                                        <Storyboard>
+                                            <DoubleAnimation RepeatBehavior="Forever" Storyboard.TargetProperty="(Ellipse.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="00:00:13" />
+                                        </Storyboard>
+                                    </BeginStoryboard>
+                                </EventTrigger>
+                            </Ellipse.Triggers>
+                        </Ellipse>
+                        <ItemsControl x:Name="PART_ListBox" ItemsSource="{TemplateBinding ItemsSource}">
+                            <ItemsControl.ItemTemplate>
+                                <DataTemplate>
+                                    <controls:SmallPanel>
+                                        <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                                            <Ellipse Fill="{Binding Bg}" Opacity=".4" />
+                                            <Ellipse Stroke="{Binding Bg}" StrokeThickness=".8" />
+                                        </controls:SmallPanel>
+                                        <TextBlock Padding="10,0" HorizontalAlignment="Center" VerticalAlignment="Center">
 											<Hyperlink Command="{x:Static controls:BubblleControl.ClickCommand}" CommandParameter="{Binding Text}" FontWeight="Normal" Foreground="{Binding Bg}">
 												<TextBlock Text="{Binding Text}" TextAlignment="Center" TextTrimming="CharacterEllipsis" ToolTip="{Binding Text}" />
 											</Hyperlink>
 										</TextBlock>
-									</controls:SmallPanel>
-								</DataTemplate>
-							</ItemsControl.ItemTemplate>
-							<ItemsControl.ItemsPanel>
-								<ItemsPanelTemplate>
-									<controls:BubblleCanvas />
-								</ItemsPanelTemplate>
-							</ItemsControl.ItemsPanel>
-						</ItemsControl>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.BubblleControl}" TargetType="{x:Type controls:BubblleControl}" />
-	<Style x:Key="WD.Magnifier" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Magnifier}">
-		<Setter Property="HorizontalAlignment" Value="Left" />
-		<Setter Property="VerticalAlignment" Value="Top" />
-		<Setter Property="IsHitTestVisible" Value="False" />
-		<Setter Property="Width" Value="200" />
-		<Setter Property="Height" Value="200" />
-		<Setter Property="BorderThickness" Value="8" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:Magnifier}">
-					<Canvas Name="PART_Canvas">
-						<Border x:Name="PART_Border" Width="{TemplateBinding Height}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
-							<Ellipse>
-								<Ellipse.Fill>
-									<VisualBrush x:Name="PART_VisualBrush" ViewboxUnits="Absolute" Visual="{Binding ParentTarget, RelativeSource={RelativeSource TemplatedParent}}" />
-								</Ellipse.Fill>
-							</Ellipse>
-						</Border>
-					</Canvas>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.MagnifierDesktop" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MagnifierDesktop}">
-		<Setter Property="WindowState" Value="Maximized" />
-		<Setter Property="WindowStyle" Value="None" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MagnifierDesktop}">
-					<AdornerDecorator>
-						<Border x:Name="PART_Border" controls:Magnifier.Add="{x:Static controls:Magnifier.Default}" />
-					</AdornerDecorator>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.Magnifier}" TargetType="{x:Type controls:Magnifier}" />
-	<Style BasedOn="{StaticResource WD.MagnifierDesktop}" TargetType="{x:Type controls:MagnifierDesktop}" />
-	<Style x:Key="WD.StepItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StepItem}">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="Padding" Value="0,6,0,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:StepItem}">
-					<StackPanel Orientation="{Binding Orientation, RelativeSource={RelativeSource AncestorType=controls:Step}, Converter={StaticResource WD.OrientationConverter}}">
-						<controls:SmallPanel>
-							<Ellipse Name="PART_Ellipse" Width="45" Height="30" HorizontalAlignment="Center" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" />
-							<Border Width="30" Height="30" HorizontalAlignment="Center" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="15">
-								<controls:SmallPanel>
-									<TextBlock Name="PART_Index" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:StepItem}}, Converter={StaticResource WD.StepIndexConverter}}" />
-									<Path Name="PART_PathComplete" Width="12" Height="12" Data="{StaticResource WD.CompleteGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" Visibility="Collapsed" />
-								</controls:SmallPanel>
-							</Border>
-						</controls:SmallPanel>
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource AncestorType=controls:Step}}" TextElement.FontWeight="Black" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
-					</StackPanel>
-					<ControlTemplate.Triggers>
-						<DataTrigger Binding="{Binding Orientation, RelativeSource={RelativeSource AncestorType=controls:Step}}" Value="Vertical">
-							<Setter Property="VerticalContentAlignment" Value="Center" />
-							<Setter TargetName="PART_Ellipse" Property="Width" Value="30" />
-							<Setter TargetName="PART_Ellipse" Property="Height" Value="45" />
-							<Setter Property="Padding" Value="6,0,0,0" />
-						</DataTrigger>
-						<Trigger Property="Status" Value="Waiting">
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-							<Setter TargetName="PART_PathComplete" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_Index" Property="Visibility" Value="Visible" />
-							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="Status" Value="InProgress">
-							<Setter Property="Foreground" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter TargetName="PART_PathComplete" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_Index" Property="Visibility" Value="Visible" />
-							<Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="Status" Value="Complete">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-							<Setter TargetName="PART_PathComplete" Property="Visibility" Value="Visible" />
-							<Setter TargetName="PART_Index" Property="Visibility" Value="Collapsed" />
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.Step" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Step}">
-		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.StepItem}" />
-		<Setter Property="VerticalContentAlignment" Value="Top" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:Step}">
-					<controls:SmallPanel>
-						<ProgressBar x:Name="PART_ProgressBar" Height="1" Margin="0,18" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Value="{Binding StepIndex, RelativeSource={RelativeSource AncestorType=controls:Step}}" />
-						<ItemsPresenter />
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="Orientation" Value="Vertical">
-							<Setter TargetName="PART_ProgressBar" Property="Width" Value="1" />
-							<Setter TargetName="PART_ProgressBar" Property="Orientation" Value="Vertical" />
-							<Setter TargetName="PART_ProgressBar" Property="Margin" Value="16,0" />
-							<Setter Property="HorizontalContentAlignment" Value="Left" />
-							<Setter Property="VerticalContentAlignment" Value="Stretch" />
-							<Setter TargetName="PART_ProgressBar" Property="RenderTransformOrigin" Value=".5,.5" />
-							<Setter TargetName="PART_ProgressBar" Property="RenderTransform">
-								<Setter.Value>
-									<RotateTransform Angle="180" />
-								</Setter.Value>
-							</Setter>
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<UniformGrid Rows="1" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="Orientation" Value="Vertical">
-				<Setter Property="ItemsPanel">
-					<Setter.Value>
-						<ItemsPanelTemplate>
-							<UniformGrid Columns="1" />
-						</ItemsPanelTemplate>
-					</Setter.Value>
-				</Setter>
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.StepItem}" TargetType="{x:Type controls:StepItem}" />
-	<Style BasedOn="{StaticResource WD.Step}" TargetType="{x:Type controls:Step}" />
-	<Style x:Key="WD.DefaultMultiSelectComboBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectComboBoxItem}">
-		<Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="SnapsToDevicePixels" Value="True" />
-		<Setter Property="Background" Value="Transparent" />
-		<Setter Property="BorderBrush" Value="Transparent" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="Margin" Value="1,0" />
-		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MultiSelectComboBoxItem}">
-					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-						<CheckBox MinHeight="{TemplateBinding MinHeight}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
-							<ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
-						</CheckBox>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.MultiSelectComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectComboBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="SelectionMode" Value="Multiple" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.DefaultMultiSelectComboBoxItem}" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MultiSelectComboBox}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OpenStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-						</Storyboard>
-						<Storyboard x:Key="CloseStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel SnapsToDevicePixels="True">
-						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
-						<TextBox Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="True" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-						<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
-						<ToggleButton x:Name="PART_ToggleButton" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Background="{TemplateBinding Background}" Template="{StaticResource WD.ComboBoxToggleButton}" />
-						<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_ToggleButton}" StaysOpen="False">
-							<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
-								<controls:SmallPanel.RenderTransform>
-									<ScaleTransform ScaleY="0" />
-								</controls:SmallPanel.RenderTransform>
-								<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-								<Grid Margin="0,8" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<controls:MultiSelectComboBoxItem x:Name="PART_CheckBoxAll" Content="{TemplateBinding SelectAllContent}" Style="{TemplateBinding ItemContainerStyle}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-									<ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Auto">
-										<ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-									</ScrollViewer>
-								</Grid>
-							</controls:SmallPanel>
-						</Popup>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
-							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
-						</Trigger>
-						<Trigger Property="Text" Value="">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Text" Value="{x:Null}">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.MultiSelectComboBox}" TargetType="{x:Type controls:MultiSelectComboBox}" />
-	<Style x:Key="WD.MaskControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MaskControl}">
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Background" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MaskControl}">
-					<controls:SmallPanel>
-						<Border x:Name="PART_Border" Width="{TemplateBinding Height}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Opacity=".7" />
-						<ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.MaskControl}" TargetType="{x:Type controls:MaskControl}" />
-	<Style x:Key="WD.MultiSelectionSearchComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectionSearchComboBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MultiSelectionSearchComboBox}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OpenStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-						</Storyboard>
-						<Storyboard x:Key="CloseStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel SnapsToDevicePixels="True">
-						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
-						<TextBox Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="True" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
-						<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
-						<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
-						<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_ToggleButton}" StaysOpen="False">
-							<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
-								<controls:SmallPanel.RenderTransform>
-									<ScaleTransform ScaleY="0" />
-								</controls:SmallPanel.RenderTransform>
-								<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-								<Grid Margin="0,8" ClipToBounds="False">
-									<Grid.RowDefinitions>
-										<RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<TextBox x:Name="PART_TextBox" Margin="6,0" helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
-									<CheckBox x:Name="PART_SelectAll" Grid.Row="1" Margin="4" Content="{TemplateBinding SelectAllContent}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-									<controls:MultiSelectListBox x:Name="PART_Selector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" />
-									<controls:MultiSelectListBox x:Name="PART_SearchSelector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSourceSearch}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" Visibility="Collapsed" />
-								</Grid>
-							</controls:SmallPanel>
-						</Popup>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
-							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
-						</Trigger>
-						<Trigger Property="Text" Value="">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="Text" Value="{x:Null}">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.MultiSelectionSearchComboBox}" TargetType="{x:Type controls:MultiSelectionSearchComboBox}" />
-	<Style x:Key="WD.BreadCrumbBarItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBarItem}">
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="6,0" />
-		<Setter Property="FontSize" Value="{StaticResource WD.MediumFontSize}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:BreadCrumbBarItem}">
-					<StackPanel Orientation="Horizontal">
-						<Path Name="PART_PathSymbol" Width="9" Height="9" Data="{StaticResource WD.ChevronRightGeometry}" Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Stretch="Uniform">
-							<Path.Visibility>
-								<MultiBinding Converter="{StaticResource WD.BreadCrumbBarConvertr}">
-									<Binding RelativeSource="{RelativeSource AncestorType=ListBoxItem}" />
-									<Binding Path="SelectedIndex" RelativeSource="{RelativeSource AncestorType=ListBox}" />
-								</MultiBinding>
-							</Path.Visibility>
-						</Path>
-						<ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
-					</StackPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.BreadCrumbBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBar}">
-		<Setter Property="Height" Value="40" />
-		<Setter Property="Margin" Value="5" />
-		<Setter Property="ItemsPanel">
-			<Setter.Value>
-				<ItemsPanelTemplate>
-					<VirtualizingStackPanel Orientation="Horizontal" />
-				</ItemsPanelTemplate>
-			</Setter.Value>
-		</Setter>
-		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.BreadCrumbBarItem}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:BreadCrumbBar}">
-					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto">
-							<ItemsPresenter x:Name="ItemsHost" />
-						</ScrollViewer>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.BreadCrumbBar}" TargetType="{x:Type controls:BreadCrumbBar}" />
-	<Style x:Key="WD.CropImage" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CropImage}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:CropImage}">
-					<Canvas x:Name="PART_Canvas">
-						<Rectangle x:Name="PART_RectangleLeft" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
-						<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" />
-					</Canvas>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.CropImage}" TargetType="{x:Type controls:CropImage}" />
-	<Style x:Key="WD.MessageListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MessageListBoxItem}">
-		<Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
-		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
-		<Setter Property="Width" Value="300" />
-		<Setter Property="Height" Value="Auto" />
-		<Setter Property="Padding" Value="10" />
-		<Setter Property="Margin" Value="4,2" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard_Close">
-							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
-							<DoubleAnimation BeginTime="0:0:0.2" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0" />
-						</Storyboard>
-						<Storyboard x:Key="Storyboard_Loaded">
-							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0" To="1" Duration="0:0:0.2" />
-							<DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="Opacity" From=".1" To="1" Duration="0:0:0.2" />
-							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
-							<DoubleAnimation BeginTime="0:0:10" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel x:Name="PART_SmallPanel" Margin="{TemplateBinding Margin}" RenderTransformOrigin=".5,0">
-						<controls:SmallPanel.RenderTransform>
-							<ScaleTransform />
-						</controls:SmallPanel.RenderTransform>
-						<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.NormalShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-						<Border Padding="{TemplateBinding Padding}">
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="*" />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<DockPanel x:Name="PART_DockPanel" Grid.Column="0">
-									<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}}">
-									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
-								</Button>
-							</Grid>
-						</Border>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="MessageType" Value="Warning">
-							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.WarningGeometry}" />
-							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.WarningSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{StaticResource WD.WarningSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="MessageType" Value="Error">
-							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ErrorGeometry}" />
-							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.DangerSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{StaticResource WD.DangerSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="MessageType" Value="Information">
-							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
-							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="MessageType" Value="Question">
-							<Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
-							<Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.NormalSolidColorBrush}" />
-							<Setter Property="Foreground" Value="{StaticResource WD.NormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsCenter" Value="True">
-							<Setter TargetName="PART_DockPanel" Property="HorizontalAlignment" Value="Center" />
-						</Trigger>
-						<EventTrigger RoutedEvent="Button.Click" SourceName="PART_CloseButton">
-							<BeginStoryboard x:Name="BeginStoryboardClose" Storyboard="{StaticResource Storyboard_Close}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard x:Name="BeginStoryboardLoaded" Storyboard="{StaticResource Storyboard_Loaded}" />
-						</EventTrigger>
-						<EventTrigger RoutedEvent="Unloaded">
-							<StopStoryboard BeginStoryboardName="BeginStoryboardLoaded" />
-							<StopStoryboard BeginStoryboardName="BeginStoryboardClose" />
-						</EventTrigger>
-						<Trigger Property="Opacity" Value="0">
-							<Setter Property="Visibility" Value="Collapsed" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.MessageListBoxItem}" TargetType="{x:Type controls:MessageListBoxItem}" />
-	<Style BasedOn="{StaticResource WD.MessageListBox}" TargetType="{x:Type controls:MessageListBox}" />
-	<Style x:Key="WD.PathIcon" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:PathIcon}">
-		<Setter Property="Padding" Value="0" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Focusable" Value="False" />
-		<Setter Property="Height" Value="16" />
-		<Setter Property="VerticalAlignment" Value="Center" />
-		<Setter Property="HorizontalAlignment" Value="Center" />
-		<Setter Property="Foreground">
-			<Setter.Value>
-				<Binding Path="Foreground" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Control}}" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Width" Value="16" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:PathIcon}">
-					<Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" UseLayoutRounding="True">
-						<Path x:Name="PART_Path" Data="{TemplateBinding Data}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stretch="Uniform" UseLayoutRounding="False" />
-					</Viewbox>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.MiniPathIcon" BasedOn="{StaticResource WD.PathIcon}" TargetType="{x:Type controls:PathIcon}">
-		<Setter Property="Height" Value="10" />
-		<Setter Property="Width" Value="7" />
-	</Style>
-	<Style BasedOn="{StaticResource WD.PathIcon}" TargetType="{x:Type controls:PathIcon}" />
-	<Style x:Key="WD.NumericBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NumericBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="FocusVisualStyle" Value="{x:Null}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:NumericBox}">
-					<controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-						<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-								</Grid.ColumnDefinitions>
-								<TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
-								<Grid Grid.Column="1" Width="{TemplateBinding UpDownButtonsWidth}">
-									<Grid.RowDefinitions>
-										<RowDefinition />
-										<RowDefinition Height="1" />
-										<RowDefinition />
-									</Grid.RowDefinitions>
-									<RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
-										<controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
-									</RepeatButton>
-									<RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
-										<controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
-									</RepeatButton>
-								</Grid>
-							</Grid>
-						</Border>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger Property="UpDownButtonsWidth" Value="0">
-							<Setter TargetName="PART_NumericDown" Property="Visibility" Value="Collapsed" />
-							<Setter TargetName="PART_NumericUp" Property="Visibility" Value="Collapsed" />
-						</Trigger>
-						<Trigger Property="IsReadOnly" Value="True">
-							<Setter Property="Focusable" Value="False" />
-							<Setter TargetName="PART_NumericDown" Property="IsEnabled" Value="False" />
-							<Setter TargetName="PART_NumericUp" Property="IsEnabled" Value="False" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}" />
-	<Style x:Key="WD.ColorPickerSlider" TargetType="{x:Type Slider}">
-		<Setter Property="Background" Value="{StaticResource WD.ColorPickerRainbowBrush}" />
-		<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
-		<Setter Property="Orientation" Value="Horizontal" />
-		<Setter Property="Height" Value="15" />
-		<Setter Property="Margin" Value="4,0" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type Slider}">
-					<controls:SmallPanel>
-						<Border MaxWidth="{TemplateBinding MaxWidth}" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" CornerRadius="2" />
-						<Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}">
-							<Track.DecreaseRepeatButton>
-								<RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
-							</Track.DecreaseRepeatButton>
-							<Track.IncreaseRepeatButton>
-								<RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
-							</Track.IncreaseRepeatButton>
-							<Track.Thumb>
-								<Thumb x:Name="Thumb" Width="15" Height="15" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource WD.ColorPickerSliderThumbTemplate}">
-									<Thumb.Effect>
-										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
-									</Thumb.Effect>
-								</Thumb>
-							</Track.Thumb>
-						</Track>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.ColorPicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ColorPicker}">
-		<Setter Property="Width" Value="260" />
-		<Setter Property="Height" Value="200" />
-		<Setter Property="Margin" Value="2" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:ColorPicker}">
-					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid>
-							<Grid.RowDefinitions>
-								<RowDefinition />
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<Canvas x:Name="PART_Canvas" Margin="1,1,1,0" ClipToBounds="True">
-								<Canvas.Background>
-									<DrawingBrush>
-										<DrawingBrush.Drawing>
-											<DrawingGroup>
-												<GeometryDrawing>
-													<GeometryDrawing.Brush>
-														<LinearGradientBrush EndPoint="1,0">
-															<GradientStop Offset="0" Color="White" />
-															<GradientStop Offset="1" Color="{Binding HueColor, RelativeSource={RelativeSource TemplatedParent}}" />
-														</LinearGradientBrush>
-													</GeometryDrawing.Brush>
-													<GeometryDrawing.Geometry>
-														<RectangleGeometry Rect="0,0,5,5" />
-													</GeometryDrawing.Geometry>
-												</GeometryDrawing>
-												<GeometryDrawing>
-													<GeometryDrawing.Brush>
-														<LinearGradientBrush EndPoint="0,1">
-															<GradientStop Offset="0" Color="#00000000" />
-															<GradientStop Offset="1" Color="{StaticResource WD.BlackColor}" />
-														</LinearGradientBrush>
-													</GeometryDrawing.Brush>
-													<GeometryDrawing.Geometry>
-														<RectangleGeometry Rect="0,0,5,5" />
-													</GeometryDrawing.Geometry>
-												</GeometryDrawing>
-											</DrawingGroup>
-										</DrawingBrush.Drawing>
-									</DrawingBrush>
-								</Canvas.Background>
-								<Thumb x:Name="PART_Thumb" Width="15" Height="15" Background="Transparent" BorderBrush="White" BorderThickness="3">
-									<Thumb.Template>
-										<ControlTemplate TargetType="{x:Type Thumb}">
-											<controls:SmallPanel>
-												<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" SnapsToDevicePixels="True">
-													<Border.Effect>
-														<DropShadowEffect Opacity=".6" ShadowDepth="0" />
-													</Border.Effect>
-												</Border>
-											</controls:SmallPanel>
-										</ControlTemplate>
-									</Thumb.Template>
-								</Thumb>
-							</Canvas>
-							<Grid Grid.Row="1" Margin="6,5,6,0">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Ellipse Width="25" Height="25" Margin="0,0,4,0" Fill="{TemplateBinding SelectedColor,&#xD;&#xA;                                                           Converter={StaticResource WD.ColorToBrushConverter}}">
-									<Ellipse.Effect>
-										<DropShadowEffect Opacity=".6" ShadowDepth="0" />
-									</Ellipse.Effect>
-								</Ellipse>
-								<Slider Name="PART_HueSlider" Grid.Column="1" Width="Auto" IsMoveToPointEnabled="True" LargeChange="0.01" Maximum="1" SmallChange="0.01" Style="{StaticResource WD.ColorPickerSlider}" Value="1" />
-							</Grid>
-							<Grid Grid.Row="2" Margin="4" VerticalAlignment="Center">
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<Grid.Resources>
-									<Style TargetType="{x:Type StackPanel}">
-										<Setter Property="Margin" Value="4,0" />
-									</Style>
-									<Style x:Key="WD.TextBoxColorPicker" BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
-										<Setter Property="VerticalContentAlignment" Value="Center" />
-										<Setter Property="TextAlignment" Value="Center" />
-										<Setter Property="Width" Value="50" />
-									</Style>
-									<Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}">
-										<Setter Property="VerticalContentAlignment" Value="Center" />
-										<Setter Property="TextAlignment" Value="Center" />
-										<Setter Property="Width" Value="50" />
-										<Setter Property="UpDownButtonsWidth" Value="0" />
-										<Setter Property="Maximum" Value="255" />
-										<Setter Property="Minimum" Value="0" />
-									</Style>
-									<Style TargetType="{x:Type TextBlock}">
-										<Setter Property="HorizontalAlignment" Value="Center" />
-										<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-										<Setter Property="FontSize" Value="10" />
-									</Style>
-								</Grid.Resources>
-								<Button Name="PART_Button" Grid.Column="0" Width="30" Height="30" Margin="0,0,4,0" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}">
-									<controls:PathIcon Kind="UnfoldMore" />
-								</Button>
-								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.RGB}}">
-									<StackPanel>
-										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToRedConverter}}" />
-										<TextBlock Text="R" />
-									</StackPanel>
-									<StackPanel>
-										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToGreenConverter}}" />
-										<TextBlock Text="G" />
-									</StackPanel>
-									<StackPanel>
-										<controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToBlueConverter}}" />
-										<TextBlock Text="B" />
-									</StackPanel>
-								</UniformGrid>
-								<UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
-									<StackPanel>
-										<TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.MaxValue="360" helpers:TextBoxHelper.MinValue="0" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
-										<TextBlock Text="H" />
-									</StackPanel>
-									<StackPanel Grid.Column="1">
-										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.SToColorConverter}}" />
-										<TextBlock Text="S" />
-									</StackPanel>
-									<StackPanel Grid.Column="2">
-										<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.LToColorConverter}}" />
-										<TextBlock Text="L" />
-									</StackPanel>
-								</UniformGrid>
-								<StackPanel Grid.Column="1" Margin="12,0" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HEX}}">
-									<TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" MaxLength="9" Text="{Binding SelectedColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToStringConverter}}" TextAlignment="Center" />
-									<TextBlock Text="HEX" />
-								</StackPanel>
-							</Grid>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
-	<Style x:Key="WD.IPEditBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:IPEditBox}">
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:IPEditBox}">
-					<ControlTemplate.Resources>
-						<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
-							<Setter Property="BorderThickness" Value="0" />
-							<Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
-							<Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
-							<Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
-							<Setter Property="VerticalContentAlignment" Value="Center" />
-							<Setter Property="HorizontalContentAlignment" Value="Center" />
-						</Style>
-						<Style TargetType="TextBlock">
-							<Setter Property="Text" Value="." />
-							<Setter Property="VerticalAlignment" Value="Center" />
-						</Style>
-					</ControlTemplate.Resources>
-					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
-						<ScrollViewer HorizontalScrollBarVisibility="Auto">
-							<Grid>
-								<Grid.ColumnDefinitions>
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-									<ColumnDefinition Width="Auto" />
-									<ColumnDefinition />
-								</Grid.ColumnDefinitions>
-								<TextBox x:Name="PART_TextBox1" />
-								<TextBlock Grid.Column="1" />
-								<TextBox x:Name="PART_TextBox2" Grid.Column="2" />
-								<TextBlock Grid.Column="3" />
-								<TextBox x:Name="PART_TextBox3" Grid.Column="4" />
-								<TextBlock Grid.Column="5" />
-								<TextBox x:Name="PART_TextBox4" Grid.Column="6" />
-							</Grid>
-						</ScrollViewer>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsKeyboardFocused" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="IsKeyboardFocused" Value="True" />
-								<Condition Property="IsMouseOver" Value="False" />
-							</MultiTrigger.Conditions>
-							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</MultiTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
-	<ControlTemplate x:Key="WD.TimePickerToggleButton" TargetType="{x:Type ToggleButton}">
-		<Border x:Name="PART_Border" Padding="6,0" Background="Transparent" BorderThickness="0" SnapsToDevicePixels="true">
-			<controls:PathIcon x:Name="PART_PathIcon" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Kind="Time" />
-		</Border>
-		<ControlTemplate.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-			</Trigger>
-			<Trigger Property="IsChecked" Value="True">
-				<Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-			</Trigger>
-		</ControlTemplate.Triggers>
-	</ControlTemplate>
-	<Style x:Key="WD.TimeSelectorItem" BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type controls:TimeSelectorItem}">
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="HorizontalContentAlignment" Value="Center" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:TimeSelectorItem}">
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsSelected" Value="True">
-							<Setter Property="FontWeight" Value="Bold" />
-							<Setter Property="Background" Value="Transparent" />
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-						</Trigger>
-						<DataTrigger Binding="{Binding}" Value="">
-							<Setter Property="IsEnabled" Value="False" />
-						</DataTrigger>
-					</ControlTemplate.Triggers>
-					<controls:SmallPanel>
-						<Border Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
-							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-						</Border>
-					</controls:SmallPanel>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.TimeListStyle" BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type controls:TimeSelectorListBox}">
-		<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
-		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
-		<Setter Property="BorderThickness" Value="0" />
-		<Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
-		<Setter Property="ItemContainerStyle" Value="{StaticResource WD.TimeSelectorItem}" />
-		<Style.Triggers>
-			<Trigger Property="IsMouseOver" Value="True">
-				<Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
-				<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style x:Key="WD.TimeSelector" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimeSelector}">
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:TimeSelector}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
-						<controls:SmallPanel SnapsToDevicePixels="True">
-							<UniformGrid Rows="1">
-								<controls:TimeSelectorListBox x:Name="PART_ListBoxHour" Style="{StaticResource WD.TimeListStyle}" />
-								<controls:TimeSelectorListBox x:Name="PART_ListBoxMinute" Style="{StaticResource WD.TimeListStyle}" />
-								<controls:TimeSelectorListBox x:Name="PART_ListBoxSecond" Style="{StaticResource WD.TimeListStyle}" />
-							</UniformGrid>
-							<Line />
-							<Path />
-							<Border Height="{TemplateBinding ItemHeight}" Margin="{TemplateBinding SelectorMargin}" VerticalAlignment="Top" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0,1" IsHitTestVisible="False" />
-						</controls:SmallPanel>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style x:Key="WD.TimePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimePicker}">
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:TimePicker}">
-					<ControlTemplate.Resources>
-						<Storyboard x:Key="OpenStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
-						</Storyboard>
-						<Storyboard x:Key="CloseStoryboard">
-							<DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
-						</Storyboard>
-					</ControlTemplate.Resources>
-					<controls:SmallPanel SnapsToDevicePixels="True">
-						<Grid Background="Transparent">
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition />
-								<ColumnDefinition Width="Auto" />
-							</Grid.ColumnDefinitions>
-							<Border Name="PART_Border" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
-							<TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" />
-							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
-							<ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" Style="{x:Null}" Template="{StaticResource WD.TimePickerToggleButton}" />
-							<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_Border}" StaysOpen="False">
-								<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
-									<controls:SmallPanel.RenderTransform>
-										<ScaleTransform ScaleY="0" />
-									</controls:SmallPanel.RenderTransform>
-									<Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
-									<controls:TimeSelector x:Name="PART_TimeSelector" />
-								</controls:SmallPanel>
-							</Popup>
-						</Grid>
-					</controls:SmallPanel>
-					<ControlTemplate.Triggers>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
-							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
-							</Trigger.EnterActions>
-							<Trigger.ExitActions>
-								<StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
-							</Trigger.ExitActions>
-						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
-							<Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
-						</Trigger>
-						<Trigger Property="SelectedTime" Value="">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<Trigger Property="SelectedTime" Value="{x:Null}">
-							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.TimeSelector}" TargetType="{x:Type controls:TimeSelector}" />
-	<Style BasedOn="{StaticResource WD.TimePicker}" TargetType="{x:Type controls:TimePicker}" />
-	<Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
-	<Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
-		<Setter Property="IsTodayHighlighted" Value="True" />
-		<Setter Property="SelectedDateFormat" Value="Short" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="HorizontalContentAlignment" Value="Left" />
-		<Setter Property="VerticalContentAlignment" Value="Center" />
-		<Setter Property="CalendarStyle" Value="{DynamicResource WD.DatePickerCalendarStyle}" />
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type DatePicker}">
-					<Border x:Name="PART_Border" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<Grid x:Name="PART_Root" Margin="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-							<Button x:Name="PART_Button" Focusable="False" Foreground="{TemplateBinding Foreground}" Style="{StaticResource WD.DropDownButtonStyle}" />
-							<DatePickerTextBox x:Name="PART_TextBox" Width="Auto" Margin="28,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" Focusable="True" Foreground="{TemplateBinding Foreground}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
-							<Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" AllowsTransparency="True" Focusable="False" HorizontalOffset="-50" Placement="Bottom" StaysOpen="False" VerticalOffset="2" />
-						</Grid>
-					</Border>
-					<ControlTemplate.Triggers>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-						<Trigger Property="IsDropDownOpen" Value="True">
-							<Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
-	<Style BasedOn="{StaticResource WD.DefaultDatePicker}" TargetType="{x:Type DatePicker}" />
-	<ControlTemplate x:Key="WD.LitePagerControlTemplate" TargetType="{x:Type controls:Pagination}">
-		<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-			<Grid>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="10" />
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="10" />
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="5" />
-					<ColumnDefinition Width="Auto" />
-					<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>
-				<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>
-				<Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
-					<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
-				</Button>
-				<controls:NumericBox x:Name="PART_JumpPageNumericBox" Grid.Column="7" Width="32" Padding="3,0" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0">
-					<controls:NumericBox.ToolTip>
-						<TextBlock>
-							<TextBlock.Text>
-								<MultiBinding StringFormat="{}{0}/{1}">
-									<Binding Path="Current" RelativeSource="{RelativeSource TemplatedParent}" />
-									<Binding Path="PageCount" RelativeSource="{RelativeSource TemplatedParent}" />
-								</MultiBinding>
-							</TextBlock.Text>
-						</TextBlock>
-					</controls:NumericBox.ToolTip>
-				</controls:NumericBox>
-				<Button Grid.Column="9" Width="32" Command="{x:Static controls:Pagination.NextCommand}">
-					<controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
-				</Button>
-			</Grid>
-		</Border>
-	</ControlTemplate>
-	<Style x:Key="WD.Pagination" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Pagination}">
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:Pagination}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="Auto" />
-								<ColumnDefinition Width="*" />
-								<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>
-							<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}}" />
-								<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}}" />
-							</StackPanel>
-							<Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
-								<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
-							</Button>
-							<ListBox x:Name="PART_ListBox" Grid.Column="3" Margin="5,0" ItemContainerStyle="{StaticResource WD.PageListBoxItemStyleKey}" ItemsSource="{TemplateBinding Pages}" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectedIndex="0" Style="{StaticResource WD.PageListBoxStyleKey}">
-								<ListBox.ItemsPanel>
-									<ItemsPanelTemplate>
-										<UniformGrid Rows="1" />
-									</ItemsPanelTemplate>
-								</ListBox.ItemsPanel>
-							</ListBox>
-							<Button Grid.Column="4" Width="32" Command="{x:Static controls:Pagination.NextCommand}">
-								<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}}" />
-								<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}}" />
-							</StackPanel>
-						</Grid>
-					</Border>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-		<Style.Triggers>
-			<Trigger Property="IsLite" Value="True">
-				<Setter Property="Template" Value="{StaticResource WD.LitePagerControlTemplate}" />
-			</Trigger>
-		</Style.Triggers>
-	</Style>
-	<Style BasedOn="{StaticResource WD.Pagination}" TargetType="{x:Type controls:Pagination}" />
+                                    </controls:SmallPanel>
+                                </DataTemplate>
+                            </ItemsControl.ItemTemplate>
+                            <ItemsControl.ItemsPanel>
+                                <ItemsPanelTemplate>
+                                    <controls:BubblleCanvas />
+                                </ItemsPanelTemplate>
+                            </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.BubblleControl}" TargetType="{x:Type controls:BubblleControl}" />
+    <Style x:Key="WD.Magnifier" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Magnifier}">
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="VerticalAlignment" Value="Top" />
+        <Setter Property="IsHitTestVisible" Value="False" />
+        <Setter Property="Width" Value="200" />
+        <Setter Property="Height" Value="200" />
+        <Setter Property="BorderThickness" Value="8" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Magnifier}">
+                    <Canvas Name="PART_Canvas">
+                        <Border x:Name="PART_Border" Width="{TemplateBinding Height}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
+                            <Ellipse>
+                                <Ellipse.Fill>
+                                    <VisualBrush x:Name="PART_VisualBrush" ViewboxUnits="Absolute" Visual="{Binding ParentTarget, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </Ellipse.Fill>
+                            </Ellipse>
+                        </Border>
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.MagnifierDesktop" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MagnifierDesktop}">
+        <Setter Property="WindowState" Value="Maximized" />
+        <Setter Property="WindowStyle" Value="None" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MagnifierDesktop}">
+                    <AdornerDecorator>
+                        <Border x:Name="PART_Border" controls:Magnifier.Add="{x:Static controls:Magnifier.Default}" />
+                    </AdornerDecorator>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.Magnifier}" TargetType="{x:Type controls:Magnifier}" />
+    <Style BasedOn="{StaticResource WD.MagnifierDesktop}" TargetType="{x:Type controls:MagnifierDesktop}" />
+    <Style x:Key="WD.StepItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StepItem}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Padding" Value="0,6,0,0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:StepItem}">
+                    <StackPanel Orientation="{Binding Orientation, RelativeSource={RelativeSource AncestorType=controls:Step}, Converter={StaticResource WD.OrientationConverter}}">
+                        <controls:SmallPanel>
+                            <Ellipse Name="PART_Ellipse" Width="45" Height="30" HorizontalAlignment="Center" Fill="{DynamicResource WD.BackgroundSolidColorBrush}" />
+                            <Border Width="30" Height="30" HorizontalAlignment="Center" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="15">
+                                <controls:SmallPanel>
+                                    <TextBlock Name="PART_Index" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type controls:StepItem}}, Converter={StaticResource WD.StepIndexConverter}}" />
+                                    <Path Name="PART_PathComplete" Width="12" Height="12" Data="{StaticResource WD.CompleteGeometry}" Fill="{TemplateBinding Foreground}" Stretch="Uniform" Visibility="Collapsed" />
+                                </controls:SmallPanel>
+                            </Border>
+                        </controls:SmallPanel>
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" ContentTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource AncestorType=controls:Step}}" TextElement.FontWeight="Black" TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Orientation, RelativeSource={RelativeSource AncestorType=controls:Step}}" Value="Vertical">
+                            <Setter Property="VerticalContentAlignment" Value="Center" />
+                            <Setter TargetName="PART_Ellipse" Property="Width" Value="30" />
+                            <Setter TargetName="PART_Ellipse" Property="Height" Value="45" />
+                            <Setter Property="Padding" Value="6,0,0,0" />
+                        </DataTrigger>
+                        <Trigger Property="Status" Value="Waiting">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                            <Setter TargetName="PART_PathComplete" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Index" Property="Visibility" Value="Visible" />
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="Status" Value="InProgress">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter TargetName="PART_PathComplete" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_Index" Property="Visibility" Value="Visible" />
+                            <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="Status" Value="Complete">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                            <Setter TargetName="PART_PathComplete" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_Index" Property="Visibility" Value="Collapsed" />
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.Step" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Step}">
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.StepItem}" />
+        <Setter Property="VerticalContentAlignment" Value="Top" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Step}">
+                    <controls:SmallPanel>
+                        <ProgressBar x:Name="PART_ProgressBar" Height="1" Margin="0,18" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Value="{Binding StepIndex, RelativeSource={RelativeSource AncestorType=controls:Step}}" />
+                        <ItemsPresenter />
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Orientation" Value="Vertical">
+                            <Setter TargetName="PART_ProgressBar" Property="Width" Value="1" />
+                            <Setter TargetName="PART_ProgressBar" Property="Orientation" Value="Vertical" />
+                            <Setter TargetName="PART_ProgressBar" Property="Margin" Value="16,0" />
+                            <Setter Property="HorizontalContentAlignment" Value="Left" />
+                            <Setter Property="VerticalContentAlignment" Value="Stretch" />
+                            <Setter TargetName="PART_ProgressBar" Property="RenderTransformOrigin" Value=".5,.5" />
+                            <Setter TargetName="PART_ProgressBar" Property="RenderTransform">
+                                <Setter.Value>
+                                    <RotateTransform Angle="180" />
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <UniformGrid Rows="1" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Orientation" Value="Vertical">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <UniformGrid Columns="1" />
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.StepItem}" TargetType="{x:Type controls:StepItem}" />
+    <Style BasedOn="{StaticResource WD.Step}" TargetType="{x:Type controls:Step}" />
+    <Style x:Key="WD.DefaultMultiSelectComboBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectComboBoxItem}">
+        <Setter Property="HorizontalContentAlignment" Value="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Margin" Value="1,0" />
+        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MultiSelectComboBoxItem}">
+                    <Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true">
+                        <CheckBox MinHeight="{TemplateBinding MinHeight}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+                            <ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
+                        </CheckBox>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.MultiSelectComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectComboBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="SelectionMode" Value="Multiple" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.DefaultMultiSelectComboBoxItem}" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MultiSelectComboBox}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel SnapsToDevicePixels="True">
+                        <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
+                        <TextBox Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="True" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
+                        <TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+                        <ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
+                        <Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_ToggleButton}" StaysOpen="False">
+                            <controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+                                <controls:SmallPanel.RenderTransform>
+                                    <ScaleTransform ScaleY="0" />
+                                </controls:SmallPanel.RenderTransform>
+                                <Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                                <Grid Margin="0,8" ClipToBounds="False">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <controls:MultiSelectComboBoxItem x:Name="PART_CheckBoxAll" Content="{TemplateBinding SelectAllContent}" Style="{TemplateBinding ItemContainerStyle}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                    <ScrollViewer x:Name="DropDownScrollViewer" Grid.Row="1" ScrollViewer.VerticalScrollBarVisibility="Auto">
+                                        <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </ScrollViewer>
+                                </Grid>
+                            </controls:SmallPanel>
+                        </Popup>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+                            <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+                        </Trigger>
+                        <Trigger Property="Text" Value="">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="Text" Value="{x:Null}">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.MultiSelectComboBox}" TargetType="{x:Type controls:MultiSelectComboBox}" />
+    <Style x:Key="WD.MaskControl" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MaskControl}">
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MaskControl}">
+                    <controls:SmallPanel>
+                        <Border x:Name="PART_Border" Width="{TemplateBinding Height}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" Opacity=".7" />
+                        <ContentPresenter Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.MaskControl}" TargetType="{x:Type controls:MaskControl}" />
+    <Style x:Key="WD.MultiSelectionSearchComboBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MultiSelectionSearchComboBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MultiSelectionSearchComboBox}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel SnapsToDevicePixels="True">
+                        <Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
+                        <TextBox Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="True" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
+                        <TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+                        <ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
+                        <Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_ToggleButton}" StaysOpen="False">
+                            <controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+                                <controls:SmallPanel.RenderTransform>
+                                    <ScaleTransform ScaleY="0" />
+                                </controls:SmallPanel.RenderTransform>
+                                <Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                                <Grid Margin="0,8" ClipToBounds="False">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <TextBox x:Name="PART_TextBox" Margin="6,0" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsClear="True" helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    <CheckBox x:Name="PART_SelectAll" Grid.Row="1" Margin="4" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{TemplateBinding SelectAllContent}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+                                    <controls:MultiSelectListBox x:Name="PART_Selector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" />
+                                    <controls:MultiSelectListBox x:Name="PART_SearchSelector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSourceSearch}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" Visibility="Collapsed" />
+                                </Grid>
+                            </controls:SmallPanel>
+                        </Popup>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+                            <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+                        </Trigger>
+                        <Trigger Property="Text" Value="">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="Text" Value="{x:Null}">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsSelectAllActive" Value="False">
+                            <Setter TargetName="PART_TextBox" Property="Margin" Value="6,2" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.MultiSelectionSearchComboBox}" TargetType="{x:Type controls:MultiSelectionSearchComboBox}" />
+    <Style x:Key="WD.BreadCrumbBarItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBarItem}">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="6,0" />
+        <Setter Property="FontSize" Value="{StaticResource WD.MediumFontSize}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:BreadCrumbBarItem}">
+                    <StackPanel Orientation="Horizontal">
+                        <Path Name="PART_PathSymbol" Width="9" Height="9" Data="{StaticResource WD.ChevronRightGeometry}" Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Stretch="Uniform">
+                            <Path.Visibility>
+                                <MultiBinding Converter="{StaticResource WD.BreadCrumbBarConvertr}">
+                                    <Binding RelativeSource="{RelativeSource AncestorType=ListBoxItem}" />
+                                    <Binding Path="SelectedIndex" RelativeSource="{RelativeSource AncestorType=ListBox}" />
+                                </MultiBinding>
+                            </Path.Visibility>
+                        </Path>
+                        <ContentPresenter x:Name="PART_ContentPresenter" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
+                    </StackPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.BreadCrumbBar" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:BreadCrumbBar}">
+        <Setter Property="Height" Value="40" />
+        <Setter Property="Margin" Value="5" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <VirtualizingStackPanel Orientation="Horizontal" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.BreadCrumbBarItem}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:BreadCrumbBar}">
+                    <Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <ScrollViewer Grid.Column="1" HorizontalScrollBarVisibility="Auto">
+                            <ItemsPresenter x:Name="ItemsHost" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.BreadCrumbBar}" TargetType="{x:Type controls:BreadCrumbBar}" />
+    <Style x:Key="WD.CropImage" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:CropImage}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:CropImage}">
+                    <Canvas x:Name="PART_Canvas">
+                        <Rectangle x:Name="PART_RectangleLeft" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
+                        <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" />
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.CropImage}" TargetType="{x:Type controls:CropImage}" />
+    <Style x:Key="WD.MessageListBoxItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:MessageListBoxItem}">
+        <Setter Property="FontSize" Value="{DynamicResource WD.NormalFontSize}" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="helpers:ListBoxItemExtensions.AutoRemoveOnOpacityZero" Value="True" />
+        <Setter Property="Width" Value="300" />
+        <Setter Property="Height" Value="Auto" />
+        <Setter Property="Padding" Value="10" />
+        <Setter Property="Margin" Value="4,2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="Storyboard_Close">
+                            <DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+                            <DoubleAnimation BeginTime="0:0:0.2" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0" />
+                        </Storyboard>
+                        <Storyboard x:Key="Storyboard_Loaded">
+                            <DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="0" To="1" Duration="0:0:0.2" />
+                            <DoubleAnimation Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="Opacity" From=".1" To="1" Duration="0:0:0.2" />
+                            <DoubleAnimation BeginTime="0:0:10" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)" From="1" To="0" Duration="0:0:0.2" />
+                            <DoubleAnimation BeginTime="0:0:10" Storyboard.TargetProperty="Opacity" From="1" To="0" Duration="0:0:0.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel x:Name="PART_SmallPanel" Margin="{TemplateBinding Margin}" RenderTransformOrigin=".5,0">
+                        <controls:SmallPanel.RenderTransform>
+                            <ScaleTransform />
+                        </controls:SmallPanel.RenderTransform>
+                        <Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.NormalShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                        <Border Padding="{TemplateBinding Padding}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <DockPanel x:Name="PART_DockPanel" Grid.Column="0">
+                                    <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}}">
+                                    <controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="MessageType" Value="Warning">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.WarningGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.WarningSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.WarningSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Error">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.ErrorGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.DangerSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.DangerSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Information">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.InformationGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.SuccessSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="MessageType" Value="Question">
+                            <Setter TargetName="PART_Path" Property="Data" Value="{StaticResource WD.QuestionGeometry}" />
+                            <Setter TargetName="PART_Path" Property="Fill" Value="{StaticResource WD.NormalSolidColorBrush}" />
+                            <Setter Property="Foreground" Value="{StaticResource WD.NormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsCenter" Value="True">
+                            <Setter TargetName="PART_DockPanel" Property="HorizontalAlignment" Value="Center" />
+                        </Trigger>
+                        <EventTrigger RoutedEvent="Button.Click" SourceName="PART_CloseButton">
+                            <BeginStoryboard x:Name="BeginStoryboardClose" Storyboard="{StaticResource Storyboard_Close}" />
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Loaded">
+                            <BeginStoryboard x:Name="BeginStoryboardLoaded" Storyboard="{StaticResource Storyboard_Loaded}" />
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="Unloaded">
+                            <StopStoryboard BeginStoryboardName="BeginStoryboardLoaded" />
+                            <StopStoryboard BeginStoryboardName="BeginStoryboardClose" />
+                        </EventTrigger>
+                        <Trigger Property="Opacity" Value="0">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.MessageListBoxItem}" TargetType="{x:Type controls:MessageListBoxItem}" />
+    <Style BasedOn="{StaticResource WD.MessageListBox}" TargetType="{x:Type controls:MessageListBox}" />
+    <Style x:Key="WD.PathIcon" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:PathIcon}">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Height" Value="16" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Foreground">
+            <Setter.Value>
+                <Binding Path="Foreground" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType={x:Type Control}}" />
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Width" Value="16" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:PathIcon}">
+                    <Viewbox Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" UseLayoutRounding="True">
+                        <Path x:Name="PART_Path" Data="{TemplateBinding Data}" Fill="{TemplateBinding Foreground}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Stretch="Uniform" UseLayoutRounding="False" />
+                    </Viewbox>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.MiniPathIcon" BasedOn="{StaticResource WD.PathIcon}" TargetType="{x:Type controls:PathIcon}">
+        <Setter Property="Height" Value="10" />
+        <Setter Property="Width" Value="7" />
+    </Style>
+    <Style BasedOn="{StaticResource WD.PathIcon}" TargetType="{x:Type controls:PathIcon}" />
+    <Style x:Key="WD.NumericBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NumericBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Disabled" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:NumericBox}">
+                    <controls:SmallPanel Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                        <Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBox x:Name="PART_TextBox" MinHeight="{TemplateBinding MinHeight}" Padding="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="Center" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" Background="{x:Null}" BorderThickness="0" FocusVisualStyle="{x:Null}" Focusable="{TemplateBinding Focusable}" FontFamily="{TemplateBinding FontFamily}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" InputMethod.IsInputMethodEnabled="False" IsReadOnly="{TemplateBinding IsReadOnly}" IsTabStop="{TemplateBinding IsTabStop}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Style="{x:Null}" TabIndex="{TemplateBinding TabIndex}" TextAlignment="{TemplateBinding TextAlignment}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
+                                <Grid Grid.Column="1" Width="{TemplateBinding UpDownButtonsWidth}">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition Height="1" />
+                                        <RowDefinition />
+                                    </Grid.RowDefinitions>
+                                    <RepeatButton x:Name="PART_NumericUp" Grid.Row="0" Margin="0,1,1,0" Padding="0" Command="{x:Static controls:NumericBox.IncreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
+                                        <controls:PathIcon Kind="ChevronUp" Style="{StaticResource WD.MiniPathIcon}" />
+                                    </RepeatButton>
+                                    <RepeatButton x:Name="PART_NumericDown" Grid.Row="2" Margin="0,0,1,1" Padding="0" Command="{x:Static controls:NumericBox.DecreaseCommand}" Delay="{TemplateBinding Delay}" IsTabStop="False" Style="{StaticResource WD.DefaultRepeatButton}">
+                                        <controls:PathIcon Kind="ChevronDown" Style="{StaticResource WD.MiniPathIcon}" />
+                                    </RepeatButton>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="UpDownButtonsWidth" Value="0">
+                            <Setter TargetName="PART_NumericDown" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_NumericUp" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                        <Trigger Property="IsReadOnly" Value="True">
+                            <Setter Property="Focusable" Value="False" />
+                            <Setter TargetName="PART_NumericDown" Property="IsEnabled" Value="False" />
+                            <Setter TargetName="PART_NumericUp" Property="IsEnabled" Value="False" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}" />
+    <Style x:Key="WD.ColorPickerSlider" TargetType="{x:Type Slider}">
+        <Setter Property="Background" Value="{StaticResource WD.ColorPickerRainbowBrush}" />
+        <Setter Property="Stylus.IsPressAndHoldEnabled" Value="false" />
+        <Setter Property="Orientation" Value="Horizontal" />
+        <Setter Property="Height" Value="15" />
+        <Setter Property="Margin" Value="4,0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Slider}">
+                    <controls:SmallPanel>
+                        <Border MaxWidth="{TemplateBinding MaxWidth}" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                        <Track x:Name="PART_Track" Orientation="{TemplateBinding Orientation}">
+                            <Track.DecreaseRepeatButton>
+                                <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+                            </Track.DecreaseRepeatButton>
+                            <Track.IncreaseRepeatButton>
+                                <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.ColorPickerSliderRepeatButtonBaseStyle}" />
+                            </Track.IncreaseRepeatButton>
+                            <Track.Thumb>
+                                <Thumb x:Name="Thumb" Width="15" Height="15" Focusable="False" OverridesDefaultStyle="True" Template="{StaticResource WD.ColorPickerSliderThumbTemplate}">
+                                    <Thumb.Effect>
+                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                    </Thumb.Effect>
+                                </Thumb>
+                            </Track.Thumb>
+                        </Track>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.ColorPicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:ColorPicker}">
+        <Setter Property="Width" Value="260" />
+        <Setter Property="Height" Value="200" />
+        <Setter Property="Margin" Value="2" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:ColorPicker}">
+                    <Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+                            <Canvas x:Name="PART_Canvas" Margin="1,1,1,0" ClipToBounds="True">
+                                <Canvas.Background>
+                                    <DrawingBrush>
+                                        <DrawingBrush.Drawing>
+                                            <DrawingGroup>
+                                                <GeometryDrawing>
+                                                    <GeometryDrawing.Brush>
+                                                        <LinearGradientBrush EndPoint="1,0">
+                                                            <GradientStop Offset="0" Color="White" />
+                                                            <GradientStop Offset="1" Color="{Binding HueColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                                                        </LinearGradientBrush>
+                                                    </GeometryDrawing.Brush>
+                                                    <GeometryDrawing.Geometry>
+                                                        <RectangleGeometry Rect="0,0,5,5" />
+                                                    </GeometryDrawing.Geometry>
+                                                </GeometryDrawing>
+                                                <GeometryDrawing>
+                                                    <GeometryDrawing.Brush>
+                                                        <LinearGradientBrush EndPoint="0,1">
+                                                            <GradientStop Offset="0" Color="#00000000" />
+                                                            <GradientStop Offset="1" Color="{StaticResource WD.BlackColor}" />
+                                                        </LinearGradientBrush>
+                                                    </GeometryDrawing.Brush>
+                                                    <GeometryDrawing.Geometry>
+                                                        <RectangleGeometry Rect="0,0,5,5" />
+                                                    </GeometryDrawing.Geometry>
+                                                </GeometryDrawing>
+                                            </DrawingGroup>
+                                        </DrawingBrush.Drawing>
+                                    </DrawingBrush>
+                                </Canvas.Background>
+                                <Thumb x:Name="PART_Thumb" Width="15" Height="15" Background="Transparent" BorderBrush="White" BorderThickness="3">
+                                    <Thumb.Template>
+                                        <ControlTemplate TargetType="{x:Type Thumb}">
+                                            <controls:SmallPanel>
+                                                <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding ActualWidth, RelativeSource={RelativeSource Self}, Converter={StaticResource WD.HalfValueConverter}}" SnapsToDevicePixels="True">
+                                                    <Border.Effect>
+                                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                                    </Border.Effect>
+                                                </Border>
+                                            </controls:SmallPanel>
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+                            </Canvas>
+                            <Grid Grid.Row="1" Margin="6,5,6,0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Ellipse Width="25" Height="25" Margin="0,0,4,0" Fill="{TemplateBinding SelectedColor,&#xD;&#xA;                                                           Converter={StaticResource WD.ColorToBrushConverter}}">
+                                    <Ellipse.Effect>
+                                        <DropShadowEffect Opacity=".6" ShadowDepth="0" />
+                                    </Ellipse.Effect>
+                                </Ellipse>
+                                <Slider Name="PART_HueSlider" Grid.Column="1" Width="Auto" IsMoveToPointEnabled="True" LargeChange="0.01" Maximum="1" SmallChange="0.01" Style="{StaticResource WD.ColorPickerSlider}" Value="1" />
+                            </Grid>
+                            <Grid Grid.Row="2" Margin="4" VerticalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <Grid.Resources>
+                                    <Style TargetType="{x:Type StackPanel}">
+                                        <Setter Property="Margin" Value="4,0" />
+                                    </Style>
+                                    <Style x:Key="WD.TextBoxColorPicker" BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+                                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                        <Setter Property="Width" Value="50" />
+                                    </Style>
+                                    <Style BasedOn="{StaticResource WD.NumericBox}" TargetType="{x:Type controls:NumericBox}">
+                                        <Setter Property="VerticalContentAlignment" Value="Center" />
+                                        <Setter Property="TextAlignment" Value="Center" />
+                                        <Setter Property="Width" Value="50" />
+                                        <Setter Property="UpDownButtonsWidth" Value="0" />
+                                        <Setter Property="Maximum" Value="255" />
+                                        <Setter Property="Minimum" Value="0" />
+                                    </Style>
+                                    <Style TargetType="{x:Type TextBlock}">
+                                        <Setter Property="HorizontalAlignment" Value="Center" />
+                                        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                                        <Setter Property="FontSize" Value="10" />
+                                    </Style>
+                                </Grid.Resources>
+                                <Button Name="PART_Button" Grid.Column="0" Width="30" Height="30" Margin="0,0,4,0" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}">
+                                    <controls:PathIcon Kind="UnfoldMore" />
+                                </Button>
+                                <UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.RGB}}">
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToRedConverter}}" />
+                                        <TextBlock Text="R" />
+                                    </StackPanel>
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToGreenConverter}}" />
+                                        <TextBlock Text="G" />
+                                    </StackPanel>
+                                    <StackPanel>
+                                        <controls:NumericBox Value="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToBlueConverter}}" />
+                                        <TextBlock Text="B" />
+                                    </StackPanel>
+                                </UniformGrid>
+                                <UniformGrid Grid.Column="1" Rows="1" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HSL}}">
+                                    <StackPanel>
+                                        <TextBox helpers:TextBoxHelper.AllowOnlyNumericInput="True" helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.MaxValue="360" helpers:TextBoxHelper.MinValue="0" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.HToColorConverter}}" />
+                                        <TextBlock Text="H" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="1">
+                                        <TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.SToColorConverter}}" />
+                                        <TextBlock Text="S" />
+                                    </StackPanel>
+                                    <StackPanel Grid.Column="2">
+                                        <TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" Style="{StaticResource WD.TextBoxColorPicker}" Text="{Binding SelectedColor, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.LToColorConverter}}" />
+                                        <TextBlock Text="L" />
+                                    </StackPanel>
+                                </UniformGrid>
+                                <StackPanel Grid.Column="1" Margin="12,0" Visibility="{Binding ColorType, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorTypeToVisibilityConverter}, ConverterParameter={x:Static controls:ColorTypeEnum.HEX}}">
+                                    <TextBox helpers:TextBoxHelper.IsEnterUpdateEnabled="True" helpers:TextBoxHelper.SelectAllOnClick="True" MaxLength="9" Text="{Binding SelectedColor, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.ColorToStringConverter}}" TextAlignment="Center" />
+                                    <TextBlock Text="HEX" />
+                                </StackPanel>
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.ColorPicker}" TargetType="{x:Type controls:ColorPicker}" />
+    <Style x:Key="WD.IPEditBox" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:IPEditBox}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:IPEditBox}">
+                    <ControlTemplate.Resources>
+                        <Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}">
+                            <Setter Property="BorderThickness" Value="0" />
+                            <Setter Property="helpers:TextBoxHelper.AllowOnlyNumericInput" Value="True" />
+                            <Setter Property="helpers:TextBoxHelper.MaxValue" Value="255" />
+                            <Setter Property="helpers:TextBoxHelper.MinValue" Value="0" />
+                            <Setter Property="VerticalContentAlignment" Value="Center" />
+                            <Setter Property="HorizontalContentAlignment" Value="Center" />
+                        </Style>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="Text" Value="." />
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                        </Style>
+                    </ControlTemplate.Resources>
+                    <Border x:Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                        <ScrollViewer HorizontalScrollBarVisibility="Auto">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition />
+                                </Grid.ColumnDefinitions>
+                                <TextBox x:Name="PART_TextBox1" />
+                                <TextBlock Grid.Column="1" />
+                                <TextBox x:Name="PART_TextBox2" Grid.Column="2" />
+                                <TextBlock Grid.Column="3" />
+                                <TextBox x:Name="PART_TextBox3" Grid.Column="4" />
+                                <TextBlock Grid.Column="5" />
+                                <TextBox x:Name="PART_TextBox4" Grid.Column="6" />
+                            </Grid>
+                        </ScrollViewer>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsKeyboardFocused" Value="True" />
+                                <Condition Property="IsMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.IPEditBox}" TargetType="{x:Type controls:IPEditBox}" />
+    <ControlTemplate x:Key="WD.TimePickerToggleButton" TargetType="{x:Type ToggleButton}">
+        <Border x:Name="PART_Border" Padding="6,0" Background="Transparent" BorderThickness="0" SnapsToDevicePixels="true">
+            <controls:PathIcon x:Name="PART_PathIcon" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}" IsHitTestVisible="False" Kind="Time" />
+        </Border>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter TargetName="PART_PathIcon" Property="Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+    <Style x:Key="WD.TimeSelectorItem" BasedOn="{StaticResource WD.DefaultListBoxItem}" TargetType="{x:Type controls:TimeSelectorItem}">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimeSelectorItem}">
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="FontWeight" Value="Bold" />
+                            <Setter Property="Background" Value="Transparent" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+                        </Trigger>
+                        <DataTrigger Binding="{Binding}" Value="">
+                            <Setter Property="IsEnabled" Value="False" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                    <controls:SmallPanel>
+                        <Border Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                    </controls:SmallPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.TimeListStyle" BasedOn="{StaticResource WD.DefaultListBox}" TargetType="{x:Type controls:TimeSelectorListBox}">
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="VirtualizingStackPanel.IsVirtualizing" Value="False" />
+        <Setter Property="ItemContainerStyle" Value="{StaticResource WD.TimeSelectorItem}" />
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+                <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style x:Key="WD.TimeSelector" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimeSelector}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimeSelector}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" UseLayoutRounding="{TemplateBinding UseLayoutRounding}">
+                        <controls:SmallPanel SnapsToDevicePixels="True">
+                            <UniformGrid Rows="1">
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxHour" Style="{StaticResource WD.TimeListStyle}" />
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxMinute" Style="{StaticResource WD.TimeListStyle}" />
+                                <controls:TimeSelectorListBox x:Name="PART_ListBoxSecond" Style="{StaticResource WD.TimeListStyle}" />
+                            </UniformGrid>
+                            <Line />
+                            <Path />
+                            <Border Height="{TemplateBinding ItemHeight}" Margin="{TemplateBinding SelectorMargin}" VerticalAlignment="Top" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0,1" IsHitTestVisible="False" />
+                        </controls:SmallPanel>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style x:Key="WD.TimePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TimePicker}">
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:TimePicker}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="1" Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation EasingFunction="{StaticResource WD.ExponentialEaseOut}" Storyboard.TargetName="PART_DropDown" Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)" To="0" Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel SnapsToDevicePixels="True">
+                        <Grid Background="Transparent">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <Border Name="PART_Border" Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
+                            <TextBox x:Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" />
+                            <TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
+                            <ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" Style="{x:Null}" Template="{StaticResource WD.TimePickerToggleButton}" />
+                            <Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_Border}" StaysOpen="False">
+                                <controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
+                                    <controls:SmallPanel.RenderTransform>
+                                        <ScaleTransform ScaleY="0" />
+                                    </controls:SmallPanel.RenderTransform>
+                                    <Border Name="PART_DropDownBorder" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True" UseLayoutRounding="True" />
+                                    <controls:TimeSelector x:Name="PART_TimeSelector" />
+                                </controls:SmallPanel>
+                            </Popup>
+                        </Grid>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
+                            <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
+                        </Trigger>
+                        <Trigger Property="SelectedTime" Value="">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="SelectedTime" Value="{x:Null}">
+                            <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.TimeSelector}" TargetType="{x:Type controls:TimeSelector}" />
+    <Style BasedOn="{StaticResource WD.TimePicker}" TargetType="{x:Type controls:TimePicker}" />
+    <Style x:Key="WD.DatePickerCalendarStyle" BasedOn="{StaticResource {x:Type Calendar}}" TargetType="{x:Type Calendar}" />
+    <Style x:Key="WD.DefaultDatePicker" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DatePicker}">
+        <Setter Property="IsTodayHighlighted" Value="True" />
+        <Setter Property="SelectedDateFormat" Value="Short" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalContentAlignment" Value="Left" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="CalendarStyle" Value="{DynamicResource WD.DatePickerCalendarStyle}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type DatePicker}">
+                    <Border x:Name="PART_Border" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                        <Grid x:Name="PART_Root" Margin="{TemplateBinding Padding}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                            <Button x:Name="PART_Button" Focusable="False" Foreground="{TemplateBinding Foreground}" Style="{StaticResource WD.DropDownButtonStyle}" />
+                            <DatePickerTextBox x:Name="PART_TextBox" Width="Auto" Margin="28,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" Focusable="True" Foreground="{TemplateBinding Foreground}" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+                            <Popup x:Name="PART_Popup" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" AllowsTransparency="True" Focusable="False" HorizontalOffset="-50" Placement="Bottom" StaysOpen="False" VerticalOffset="2" />
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsDropDownOpen" Value="True">
+                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DefaultDatePicker}" TargetType="{x:Type DatePicker}" />
+    <ControlTemplate x:Key="WD.LitePagerControlTemplate" TargetType="{x:Type controls:Pagination}">
+        <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="10" />
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="5" />
+                    <ColumnDefinition Width="Auto" />
+                    <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>
+                <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>
+                <Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
+                    <controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
+                </Button>
+                <controls:NumericBox x:Name="PART_JumpPageNumericBox" Grid.Column="7" Width="32" Padding="3,0" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0">
+                    <controls:NumericBox.ToolTip>
+                        <TextBlock>
+                            <TextBlock.Text>
+                                <MultiBinding StringFormat="{}{0}/{1}">
+                                    <Binding Path="Current" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="PageCount" RelativeSource="{RelativeSource TemplatedParent}" />
+                                </MultiBinding>
+                            </TextBlock.Text>
+                        </TextBlock>
+                    </controls:NumericBox.ToolTip>
+                </controls:NumericBox>
+                <Button Grid.Column="9" Width="32" Command="{x:Static controls:Pagination.NextCommand}">
+                    <controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
+                </Button>
+            </Grid>
+        </Border>
+    </ControlTemplate>
+    <Style x:Key="WD.Pagination" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:Pagination}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Pagination}">
+                    <Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <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>
+                            <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}}" />
+                                <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}}" />
+                            </StackPanel>
+                            <Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
+                                <controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
+                            </Button>
+                            <ListBox x:Name="PART_ListBox" Grid.Column="3" Margin="5,0" ItemContainerStyle="{StaticResource WD.PageListBoxItemStyleKey}" ItemsSource="{TemplateBinding Pages}" ScrollViewer.HorizontalScrollBarVisibility="Hidden" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectedIndex="0" Style="{StaticResource WD.PageListBoxStyleKey}">
+                                <ListBox.ItemsPanel>
+                                    <ItemsPanelTemplate>
+                                        <UniformGrid Rows="1" />
+                                    </ItemsPanelTemplate>
+                                </ListBox.ItemsPanel>
+                            </ListBox>
+                            <Button Grid.Column="4" Width="32" Command="{x:Static controls:Pagination.NextCommand}">
+                                <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}}" />
+                                <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}}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsLite" Value="True">
+                <Setter Property="Template" Value="{StaticResource WD.LitePagerControlTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.Pagination}" TargetType="{x:Type controls:Pagination}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
index 686e2ba2..38427bc8 100644
--- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
+++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -3,7 +3,6 @@
 	<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/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index a09c4935..3c8b67c3 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -1668,7 +1668,7 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultTextBox}" TargetType="{x:Type TextBox}" />
 	<ControlTemplate x:Key="WD.ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-		<Border x:Name="PART_Border" Padding="6,0" BorderThickness="0" SnapsToDevicePixels="true">
+		<Border x:Name="PART_Border" Padding="6,1.2" BorderThickness="0" SnapsToDevicePixels="true">
 			<Grid Background="Transparent">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition />
@@ -3768,10 +3768,10 @@
 							</controls:SmallPanel>
 							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
 								<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_ButtonYes" Width="60" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" 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" helpers:ElementHelper.CornerRadius="{Binding Path=(controls:WDMessageBox.ButtonCornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>
@@ -3869,14 +3869,14 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.NormalLoading}" TargetType="{x:Type controls:NormalLoading}" />
 	<Style BasedOn="{StaticResource WD.DefaultLoading}" TargetType="{x:Type controls:DefaultLoading}" />
-	<Style x:Key="WD.ThemeControl" TargetType="{x:Type controls:ThemeControl}">
+	<Style x:Key="WD.Theme" TargetType="{x:Type controls:Theme}">
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:ThemeControl}">
-					<ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:ThemeControl}}">
+				<ControlTemplate TargetType="{x:Type controls:Theme}">
+					<ItemsControl ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource AncestorType=controls:Theme}}">
 						<ItemsControl.ItemTemplate>
 							<DataTemplate>
-								<RadioButton Width="40" Height="40" Margin="4,0" Cursor="Hand" IsChecked="{Binding IsChecked}">
+								<RadioButton Width="40" Height="40" Cursor="Hand" IsChecked="{Binding IsChecked}">
 									<RadioButton.Style>
 										<Style TargetType="{x:Type RadioButton}">
 											<Setter Property="Template">
@@ -3907,7 +3907,7 @@
 						</ItemsControl.ItemTemplate>
 						<ItemsControl.ItemsPanel>
 							<ItemsPanelTemplate>
-								<WrapPanel />
+								<WrapPanel helpers:PanelHelper.Spacing="4" />
 							</ItemsPanelTemplate>
 						</ItemsControl.ItemsPanel>
 					</ItemsControl>
@@ -3915,7 +3915,7 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.ThemeControl}" TargetType="{x:Type controls:ThemeControl}" />
+	<Style BasedOn="{StaticResource WD.Theme}" TargetType="{x:Type controls:Theme}" />
 	<Style x:Key="WD.GridSplitterPreviewStyle">
 		<Setter Property="Control.Template">
 			<Setter.Value>
@@ -3944,7 +3944,7 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Label}">
-					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+					<Border Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true">
 						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 					</Border>
 				</ControlTemplate>
@@ -4100,7 +4100,7 @@
 							</ObjectAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding helpers:ControlsHelper.CornerRadius}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+					<Border x:Name="PART_Border" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding helpers:ElementHelper.CornerRadius}" SnapsToDevicePixels="True" UseLayoutRounding="True">
 						<Grid>
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition />
@@ -4649,91 +4649,52 @@
 		</Setter>
 	</Style>
 	<Style BasedOn="{StaticResource WD.EdgeLight}" TargetType="{x:Type controls:EdgeLight}" />
-	<Style x:Key="WD.StreamerLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:StreamerLoading}">
-		<Setter Property="Width" Value="100" />
-		<Setter Property="Height" Value="100" />
-		<Setter Property="Background">
-			<Setter.Value>
-				<SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-			</Setter.Value>
-		</Setter>
-		<Setter Property="Template">
-			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:StreamerLoading}">
-					<Rectangle x:Name="PART_Rectangle" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" HorizontalAlignment="Center" VerticalAlignment="Center" StrokeThickness="3">
-						<Rectangle.Stroke>
-							<LinearGradientBrush Opacity=".6" StartPoint="0.5,0" EndPoint="0.5,1">
-								<GradientStop Offset="0" Color="Transparent" />
-								<GradientStop Offset="1" Color="{Binding Path=Background.Color, RelativeSource={RelativeSource TemplatedParent}}" />
-							</LinearGradientBrush>
-						</Rectangle.Stroke>
-					</Rectangle>
-					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard>
-								<Storyboard RepeatBehavior="Forever">
-									<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.StartPoint)">
-										<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.855,0.148" />
-										<EasingPointKeyFrame KeyTime="0:0:1" Value="0.852,0.855" />
-										<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.148,0.855" />
-										<EasingPointKeyFrame KeyTime="0:0:2" Value="0.144,0.149" />
-										<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,0" />
-									</PointAnimationUsingKeyFrames>
-									<PointAnimationUsingKeyFrames Storyboard.TargetName="PART_Rectangle" Storyboard.TargetProperty="(Shape.Stroke).(LinearGradientBrush.EndPoint)">
-										<EasingPointKeyFrame KeyTime="0:0:0.5" Value="0.145,0.852" />
-										<EasingPointKeyFrame KeyTime="0:0:1" Value="0.148,0.145" />
-										<EasingPointKeyFrame KeyTime="0:0:1.5" Value="0.852,0.145" />
-										<EasingPointKeyFrame KeyTime="0:0:2" Value="0.856,0.851" />
-										<EasingPointKeyFrame KeyTime="0:0:2.5" Value="0,1" />
-									</PointAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</ControlTemplate.Triggers>
-				</ControlTemplate>
-			</Setter.Value>
-		</Setter>
-	</Style>
 	<Style x:Key="WD.WaitLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:WaitLoading}">
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:WaitLoading}">
-					<Canvas Width="100" Height="20">
+					<ControlTemplate.Resources>
+						<Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="100" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
+								<EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
+								<EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="0" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+								<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="0" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
+								<EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
+								<EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
+								<EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="0" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
+								<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="100" />
+							</DoubleAnimationUsingKeyFrames>
+						</Storyboard>
+					</ControlTemplate.Resources>
+					<Canvas Width="100" Height="20" CacheMode="BitmapCache">
 						<Ellipse x:Name="PART_RedEllipase" Canvas.Left="0" Width="20" Height="20" Fill="{StaticResource WD.DangerSolidColorBrush}" />
 						<Ellipse x:Name="PART_GreenEllipase" Canvas.Left="50" Width="20" Height="20" Fill="{StaticResource WD.SuccessSolidColorBrush}" />
 						<Ellipse x:Name="PART_OrangeEllipase" Canvas.Left="100" Width="20" Height="20" Fill="{StaticResource WD.WarningSolidColorBrush}" />
 					</Canvas>
 					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard>
-								<Storyboard RepeatBehavior="Forever">
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_RedEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="100" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:2" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="0" />
-									</DoubleAnimationUsingKeyFrames>
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_GreenEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="0" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:3" Value="50" />
-									</DoubleAnimationUsingKeyFrames>
-									<DoubleAnimationUsingKeyFrames Storyboard.TargetName="PART_OrangeEllipase" Storyboard.TargetProperty="(Canvas.Left)">
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0.5" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:1" Value="50" />
-										<EasingDoubleKeyFrame KeyTime="0:0:1.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2" Value="0" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:2.5" Value="50" />
-										<EasingDoubleKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:3" Value="100" />
-									</DoubleAnimationUsingKeyFrames>
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
+						<Trigger Property="IsLoading" Value="True">
+							<Trigger.EnterActions>
+								<BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
+							</Trigger.EnterActions>
+							<Trigger.ExitActions>
+								<StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
+							</Trigger.ExitActions>
+						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -4748,22 +4709,17 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:CycleLoading}">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="Storyboard_LoadRunning" RepeatBehavior="Forever" SpeedRatio="2">
-							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+						<Storyboard x:Key="Storyboard_LoadRunning" DesiredFrameRate="30" RepeatBehavior="Forever" SpeedRatio="2">
+							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" Storyboard.TargetName="Part_Cycle_Rotate1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<controls:SmallPanel>
+					<controls:SmallPanel CacheMode="BitmapCache">
 						<Viewbox>
 							<controls:SmallPanel Width="400" Height="400">
 								<controls:SmallPanel x:Name="Part_Cycle_Rotate1" RenderTransformOrigin="0.5,0.5">
 									<controls:SmallPanel.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</controls:SmallPanel.RenderTransform>
 									<Ellipse Margin="0,50,0,50">
 										<Ellipse.Fill>
@@ -4790,12 +4746,7 @@
 								</controls:SmallPanel>
 								<controls:SmallPanel x:Name="Part_Cycle_Rotate" RenderTransformOrigin="0.5,0.5">
 									<controls:SmallPanel.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</controls:SmallPanel.RenderTransform>
 									<Ellipse Margin="0,50,0,50">
 										<Ellipse.Fill>
@@ -4839,7 +4790,7 @@
 						</Grid>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
+						<Trigger Property="IsLoading" Value="True">
 							<Trigger.EnterActions>
 								<BeginStoryboard x:Name="Storyboard_LoadRunning" Storyboard="{StaticResource Storyboard_LoadRunning}" />
 							</Trigger.EnterActions>
@@ -4858,15 +4809,15 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:RollLoading}">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="RollKey" RepeatBehavior="Forever">
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="2" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="4" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="6" Storyboard.TargetName="PART_Border3" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="8" Storyboard.TargetName="PART_Border4" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="10" Storyboard.TargetName="PART_Border5" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="12" Storyboard.TargetName="PART_Border6" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="14" Storyboard.TargetName="PART_Border7" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
-							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="16" Storyboard.TargetName="PART_Border8" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+						<Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="2" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="4" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="6" Storyboard.TargetName="PART_Border3" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="8" Storyboard.TargetName="PART_Border4" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="10" Storyboard.TargetName="PART_Border5" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="12" Storyboard.TargetName="PART_Border6" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="14" Storyboard.TargetName="PART_Border7" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
+							<DoubleAnimation BeginTime="0" RepeatBehavior="Forever" SpeedRatio="16" Storyboard.TargetName="PART_Border8" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" From="0" To="360" Duration="0:0:5" />
 							<ColorAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetProperty="ForegroundColor" Duration="0:0:5">
 								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:0" Value="Red" />
 								<EasingColorKeyFrame EasingFunction="{StaticResource WD.PowerEaseInOut}" KeyTime="0:0:1" Value="Blue" />
@@ -4877,7 +4828,7 @@
 							</ColorAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Grid>
+					<Grid CacheMode="BitmapCache">
 						<Grid.RowDefinitions>
 							<RowDefinition />
 							<RowDefinition Height="Auto" />
@@ -4894,12 +4845,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border2" Width="140" Height="140" BorderThickness="0,5,0,0" CornerRadius="70" RenderTransformOrigin="0.5,0.5">
@@ -4912,12 +4858,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border3" Width="120" Height="120" BorderThickness="0,5,0,0" CornerRadius="60" RenderTransformOrigin="0.5,0.5">
@@ -4930,12 +4871,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border4" Width="100" Height="100" BorderThickness="0,5,0,0" CornerRadius="50" RenderTransformOrigin="0.5,0.5">
@@ -4948,12 +4884,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border5" Width="80" Height="80" BorderThickness="0,5,0,0" CornerRadius="40" RenderTransformOrigin="0.5,0.5">
@@ -4966,12 +4897,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border6" Width="60" Height="60" BorderThickness="0,5,0,0" CornerRadius="30" RenderTransformOrigin="0.5,0.5">
@@ -4984,12 +4910,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border7" Width="40" Height="40" BorderThickness="0,5,0,0" CornerRadius="20" RenderTransformOrigin="0.5,0.5">
@@ -5002,12 +4923,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 								<Border x:Name="PART_Border8" Width="20" Height="20" BorderThickness="0,5,0,0" CornerRadius="10" RenderTransformOrigin="0.5,0.5">
@@ -5020,12 +4936,7 @@
 										</LinearGradientBrush>
 									</Border.BorderBrush>
 									<Border.RenderTransform>
-										<TransformGroup>
-											<ScaleTransform />
-											<SkewTransform />
-											<RotateTransform />
-											<TranslateTransform />
-										</TransformGroup>
+										<RotateTransform />
 									</Border.RenderTransform>
 								</Border>
 							</controls:SmallPanel>
@@ -5033,9 +4944,9 @@
 						<ContentPresenter Grid.Row="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
 					</Grid>
 					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
+						<Trigger Property="IsLoading" Value="True">
 							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource RollKey}" />
+								<BeginStoryboard x:Name="Roll_Storyboard" Storyboard="{StaticResource PART_Storyboard}" />
 							</Trigger.EnterActions>
 							<Trigger.ExitActions>
 								<StopStoryboard BeginStoryboardName="Roll_Storyboard" />
@@ -5051,13 +4962,13 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="controls:RingLoading">
 					<ControlTemplate.Resources>
-						<Storyboard x:Key="PART_Resource_Storyboard" RepeatBehavior="Forever">
-							<DoubleAnimation Storyboard.TargetName="PART_Ring1" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="-495" Duration="0:0:1.5" />
-							<DoubleAnimation Storyboard.TargetName="PART_Ring2" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="585" Duration="0:0:1.5" />
-							<DoubleAnimation Storyboard.TargetName="PART_Ring3" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)" To="-315" Duration="0:0:1.5" />
+						<Storyboard x:Key="PART_Storyboard" DesiredFrameRate="30" RepeatBehavior="Forever">
+							<DoubleAnimation Storyboard.TargetName="PART_Ring1" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="-495" Duration="0:0:1.5" />
+							<DoubleAnimation Storyboard.TargetName="PART_Ring2" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="585" Duration="0:0:1.5" />
+							<DoubleAnimation Storyboard.TargetName="PART_Ring3" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="-315" Duration="0:0:1.5" />
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<Grid>
+					<Grid CacheMode="BitmapCache">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="*" />
 							<RowDefinition Height="Auto" />
@@ -5067,12 +4978,7 @@
 								<controls:SmallPanel>
 									<controls:SmallPanel x:Name="PART_Ring1" Width="60" Height="60" HorizontalAlignment="Center" VerticalAlignment="Top" RenderTransformOrigin="0.5,0.5">
 										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="-135" />
-												<TranslateTransform />
-											</TransformGroup>
+											<RotateTransform Angle="-135" />
 										</controls:SmallPanel.RenderTransform>
 										<Ellipse RenderTransformOrigin="0.5,0.5" Stroke="Red" StrokeDashArray="23 100" StrokeThickness="2" />
 										<Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="Red" CornerRadius="10">
@@ -5083,12 +4989,7 @@
 									</controls:SmallPanel>
 									<controls:SmallPanel x:Name="PART_Ring2" Width="60" Height="60" HorizontalAlignment="Left" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
 										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="225" />
-												<TranslateTransform />
-											</TransformGroup>
+											<RotateTransform Angle="225" />
 										</controls:SmallPanel.RenderTransform>
 										<Ellipse Stroke="Purple" StrokeDashArray="23 100" StrokeThickness="2" />
 										<Border Width="10" Height="10" Margin="0,0,0,-4" HorizontalAlignment="Center" VerticalAlignment="Bottom" Background="Purple" CornerRadius="10">
@@ -5099,12 +5000,7 @@
 									</controls:SmallPanel>
 									<controls:SmallPanel x:Name="PART_Ring3" Width="60" Height="60" HorizontalAlignment="Right" VerticalAlignment="Bottom" RenderTransformOrigin="0.5,0.5">
 										<controls:SmallPanel.RenderTransform>
-											<TransformGroup>
-												<ScaleTransform />
-												<SkewTransform />
-												<RotateTransform Angle="45" />
-												<TranslateTransform />
-											</TransformGroup>
+											<RotateTransform Angle="45" />
 										</controls:SmallPanel.RenderTransform>
 										<Ellipse Stroke="#0fb8b2" StrokeDashArray="23 100" StrokeThickness="2" />
 										<Border Width="10" Height="10" Margin="0,0,-4,0" HorizontalAlignment="Right" Background="#0fb8b2" CornerRadius="10">
@@ -5123,9 +5019,9 @@
 						</StackPanel>
 					</Grid>
 					<ControlTemplate.Triggers>
-						<Trigger Property="IsStart" Value="True">
+						<Trigger Property="IsLoading" Value="True">
 							<Trigger.EnterActions>
-								<BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Resource_Storyboard}" />
+								<BeginStoryboard x:Name="PART_BeginStoryboard" Storyboard="{StaticResource PART_Storyboard}" />
 							</Trigger.EnterActions>
 							<Trigger.ExitActions>
 								<StopStoryboard BeginStoryboardName="PART_BeginStoryboard" />
@@ -5136,7 +5032,6 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.StreamerLoading}" TargetType="{x:Type controls:StreamerLoading}" />
 	<Style BasedOn="{StaticResource WD.WaitLoading}" TargetType="{x:Type controls:WaitLoading}" />
 	<Style BasedOn="{StaticResource WD.CycleLoading}" TargetType="{x:Type controls:CycleLoading}" />
 	<Style BasedOn="{StaticResource WD.RollLoading}" TargetType="{x:Type controls:RollLoading}" />
@@ -5738,12 +5633,13 @@
 		<Setter Property="Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
 		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="Margin" Value="1,0" />
+		<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="Padding" Value="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsControl}}}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type controls:MultiSelectComboBoxItem}">
-					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
-						<CheckBox MinHeight="{TemplateBinding MinHeight}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
+					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="true">
+						<CheckBox MinHeight="{TemplateBinding MinHeight}" HorizontalAlignment="Stretch" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Foreground="{TemplateBinding Foreground}" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}">
 							<ContentPresenter x:Name="PART_ContentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.Foreground="{TemplateBinding Foreground}" />
 						</CheckBox>
 					</Border>
@@ -5783,7 +5679,7 @@
 						<Border Name="PART_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" />
 						<TextBox Name="PART_EditableTextBox" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="{TemplateBinding Background}" Focusable="True" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" IsReadOnly="True" SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxTextBox}" Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
 						<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Background="Transparent" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsHitTestVisible="False" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
-						<ToggleButton x:Name="PART_ToggleButton" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Background="{TemplateBinding Background}" Template="{StaticResource WD.ComboBoxToggleButton}" />
+						<ToggleButton x:Name="PART_ToggleButton" Background="{TemplateBinding Background}" ClickMode="Release" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{x:Null}" Template="{StaticResource WD.ComboBoxToggleButton}" />
 						<Popup x:Name="PART_Popup" AllowsTransparency="True" IsOpen="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" Placement="Bottom" PlacementTarget="{Binding ElementName=PART_ToggleButton}" StaysOpen="False">
 							<controls:SmallPanel x:Name="PART_DropDown" MinWidth="{TemplateBinding FrameworkElement.ActualWidth}" MaxHeight="{TemplateBinding MaxDropDownHeight}" Margin="24,2,24,24" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True">
 								<controls:SmallPanel.RenderTransform>
@@ -5892,10 +5788,10 @@
 										<RowDefinition Height="Auto" />
 										<RowDefinition />
 									</Grid.RowDefinitions>
-									<TextBox x:Name="PART_TextBox" Margin="6,0" helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
-									<CheckBox x:Name="PART_SelectAll" Grid.Row="1" Margin="4" Content="{TemplateBinding SelectAllContent}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-									<controls:MultiSelectListBox x:Name="PART_Selector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" />
-									<controls:MultiSelectListBox x:Name="PART_SearchSelector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSourceSearch}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" Visibility="Collapsed" />
+									<TextBox x:Name="PART_TextBox" Margin="6,0" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsClear="True" helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
+									<CheckBox x:Name="PART_SelectAll" Grid.Row="1" Margin="4" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Content="{TemplateBinding SelectAllContent}" Visibility="{TemplateBinding IsSelectAllActive,&#xD;&#xA;                                                                     Converter={StaticResource WD.Bool2VisibilityConverter}}" />
+									<controls:MultiSelectListBox x:Name="PART_Selector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" />
+									<controls:MultiSelectListBox x:Name="PART_SearchSelector" Grid.Row="2" Margin="1,0" Padding="{TemplateBinding Padding}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" DisplayMemberPath="{TemplateBinding DisplayMemberPath}" ItemContainerStyle="{StaticResource WD.DefaultMultiSelectComboBoxItem}" ItemsSource="{TemplateBinding ItemsSourceSearch}" ScrollViewer.CanContentScroll="{Binding ScrollViewer.CanContentScroll, RelativeSource={RelativeSource TemplatedParent}}" ScrollViewer.HorizontalScrollBarVisibility="{Binding ScrollViewer.HorizontalScrollBarVisibility, RelativeSource={RelativeSource TemplatedParent}}" SelectedValuePath="{TemplateBinding SelectedValuePath}" SelectionMode="Multiple" Style="{StaticResource WD.DefaultListBox}" Visibility="Collapsed" />
 								</Grid>
 							</controls:SmallPanel>
 						</Popup>
@@ -5929,6 +5825,9 @@
 						<Trigger Property="Text" Value="{x:Null}">
 							<Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
 						</Trigger>
+						<Trigger Property="IsSelectAllActive" Value="False">
+							<Setter TargetName="PART_TextBox" Property="Margin" Value="6,2" />
+						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index a88a6a9b..f62c243d 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -4,7 +4,6 @@
 	<PropertyGroup>
 		<UseWindowsForms>true</UseWindowsForms>
 		<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.Shared/Themes/AnimationAudio.xaml b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
index ba09f065..11726ec7 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
@@ -45,7 +45,7 @@
                     <Border
                         x:Name="PART_Border"
                         Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding helpers:ControlsHelper.CornerRadius}"
+                        CornerRadius="{TemplateBinding helpers:ElementHelper.CornerRadius}"
                         SnapsToDevicePixels="True"
                         UseLayoutRounding="True">
                         <Grid>
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index fdc20b1f..bf19e765 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -30,7 +30,7 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.TreeView.xaml
 ..\Styles\Styles.MessageBox.xaml
 ..\Styles\Styles.Loading.xaml
-..\Styles\Styles.ThemeControl.xaml
+..\Styles\Styles.Theme.xaml
 ..\Styles\Styles.GridSplitter.xaml
 ..\Styles\Styles.Label.xaml
 ..\Styles\Styles.RepeatButton.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 9c851e0b..0679547f 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -30,7 +30,7 @@ Basic\ControlBasic.xaml
 ..\Styles\Styles.TreeView.xaml
 ..\Styles\Styles.MessageBox.xaml
 ..\Styles\Styles.Loading.xaml
-..\Styles\Styles.ThemeControl.xaml
+..\Styles\Styles.Theme.xaml
 ..\Styles\Styles.GridSplitter.xaml
 ..\Styles\Styles.Label.xaml
 ..\Styles\Styles.RepeatButton.xaml
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 1343d183..0f9c3444 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -20,9 +20,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\LoadingExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\WaterfallPanel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCaptureExt.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\Theme.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\ThemeModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimePicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelector.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TimePicker\TimeSelectorItem.cs" />
@@ -53,7 +56,9 @@
     <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\PanelHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\FormatExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Languages\Language.Designer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />
@@ -132,8 +137,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Status.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Step\Step.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Step\StepItem.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ThemeControl\ThemeControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\ThemeControl\ThemeModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Thermometer\Thermometer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\VerifyCode\VerifyCode.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\VirtualizingWrapPanel\VirtualizingWrapPanel.cs" />
@@ -376,7 +379,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.ThemeControl.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Styles\Styles.Theme.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>

From b60970cbade2e95b469ced291a1975f7921464d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Wed, 18 Sep 2024 23:28:27 +0800
Subject: [PATCH 093/123] Update AnimationAudio.xaml

---
 src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
index 11726ec7..1c80da1e 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationAudio.xaml
@@ -15,6 +15,7 @@
         <Setter Property="Height" Value="35" />
         <Setter Property="Foreground" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+        <Setter Property="helpers:ElementHelper.CornerRadius" Value="3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:AnimationAudio}">
@@ -45,7 +46,7 @@
                     <Border
                         x:Name="PART_Border"
                         Background="{TemplateBinding Background}"
-                        CornerRadius="{TemplateBinding helpers:ElementHelper.CornerRadius}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="True"
                         UseLayoutRounding="True">
                         <Grid>

From 6bf04b447aa2d58af9e8bf28f27e8309cf83f6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 7 Oct 2024 21:09:45 +0800
Subject: [PATCH 094/123] add in SpacingExample

add in SpacingExample
---
 .../ExampleViews/SpacingExample.xaml          | 73 +++++++++++++++++++
 .../ExampleViews/SpacingExample.xaml.cs       | 15 ++++
 .../Helpers/MenuEnum.cs                       |  1 +
 .../ViewModels/MainVM.cs                      |  3 +
 .../WPFDevelopers.Samples.Shared.projitems    |  7 ++
 .../WPFDevelopers.SamplesCode.csproj          |  4 +
 .../Core/Helpers/PanelHelper.cs               |  1 -
 7 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml.cs

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml
new file mode 100644
index 00000000..bc3cf03b
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml
@@ -0,0 +1,73 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.SpacingExample"
+    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>
+        <TabControl>
+            <TabItem
+                Height="40"
+                Padding="20,0"
+                Header="StackPanel">
+                <StackPanel wd:PanelHelper.Spacing="3">
+                    <Button Content="Content 1" Style="{StaticResource WD.PrimaryButton}" />
+                    <Button Content="Content 2" Style="{StaticResource WD.PrimaryButton}" />
+                    <Button Content="Content 3" Style="{StaticResource WD.PrimaryButton}" />
+                </StackPanel>
+            </TabItem>
+            <TabItem
+                Height="40"
+                Padding="20,0"
+                Header="WrapPanel">
+                <WrapPanel wd:PanelHelper.Spacing="3">
+                    <Button Content="Content 1" Style="{StaticResource WD.DangerPrimaryButton}" />
+                    <Button Content="Content 2" Style="{StaticResource WD.DangerPrimaryButton}" />
+                    <Button Content="Content 3" Style="{StaticResource WD.DangerPrimaryButton}" />
+                </WrapPanel>
+            </TabItem>
+            <TabItem
+                Height="40"
+                Padding="20,0"
+                Header="UniformGrid">
+                <UniformGrid wd:PanelHelper.Spacing="3">
+                    <Button Content="Content 1" Style="{StaticResource WD.SuccessPrimaryButton}" />
+                    <Button Content="Content 2" Style="{StaticResource WD.SuccessPrimaryButton}" />
+                    <Button Content="Content 3" Style="{StaticResource WD.SuccessPrimaryButton}" />
+                </UniformGrid>
+            </TabItem>
+            <TabItem
+                Height="40"
+                Padding="20,0"
+                Header="Grid">
+                <Grid wd:PanelHelper.Spacing="3">
+                    <Button
+                        Width="200"
+                        Height="200"
+                        Content="Content 1"
+                        Style="{StaticResource WD.WarningPrimaryButton}" />
+                    <Button
+                        Width="180"
+                        Height="180"
+                        Content="Content 2"
+                        Style="{StaticResource WD.DangerPrimaryButton}" />
+                    <Button
+                        Width="160"
+                        Height="160"
+                        Content="Content 3"
+                        Style="{StaticResource WD.SuccessPrimaryButton}" />
+                </Grid>
+            </TabItem>
+        </TabControl>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/SpacingExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/SpacingExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml.cs
new file mode 100644
index 00000000..5a4bab09
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpacingExample.xaml.cs
@@ -0,0 +1,15 @@
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// SpacingExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class SpacingExample : UserControl
+    {
+        public SpacingExample()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index dd0a98bf..ada7be99 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -83,6 +83,7 @@ public enum MenuEnum
         ChartLine,
         Drap,
         ChartPie,
+        Spacing,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index 90cec06f..c56d638d 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -352,6 +352,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.ChartPie:
                     ControlPanel = new ChartPieExample();
                     break;
+                case MenuEnum.Spacing:
+                    ControlPanel = new SpacingExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 918e71c7..311d3538 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -381,6 +381,9 @@
       <SubType>Code</SubType>
       <DependentUpon>SongWordsExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\SpacingExample.xaml.cs">
+      <DependentUpon>SpacingExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\SpeedRockets\SpeedRocketsExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>SpeedRocketsExample.xaml</DependentUpon>
@@ -885,6 +888,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\SpacingExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\SpeedRockets\SpeedRocketsExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index a03a400e..ff12b088 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -146,6 +146,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartLineExample.xaml.cs" Link="ExampleViews\ChartLineExample.xaml.cs" DependentUpon="ChartLineExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\\Loadings\StreamerLoading.cs" Link="Controls\Loadings\StreamerLoading.cs"/>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -496,5 +497,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\Loadings\StreamerLoading.xaml">
 			<Link>Controls\Loadings\StreamerLoading.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml">
+			<Link>ExampleViews\SpacingExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs
index eba40d29..360e74e2 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/PanelHelper.cs
@@ -6,7 +6,6 @@ namespace WPFDevelopers.Helpers
 {
     public class PanelHelper : DependencyObject
     {
-
         public static double GetSpacing(DependencyObject obj)
         {
             return (double)obj.GetValue(SpacingProperty);

From bba6f08b1de76775052f25a0a83c4e041af87898 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:32:22 +0800
Subject: [PATCH 095/123] Update BadgeExample.xaml

---
 .../ExampleViews/BadgeExample.xaml                     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
index 926b8970..84b26186 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BadgeExample.xaml
@@ -20,10 +20,12 @@
                 x:Name="MyBadgeToggleButton"
                 Margin="10"
                 HorizontalAlignment="Center"
-                Content="显示Badge" />
+                Content="显示Badge"
+                IsChecked="True" />
             <UniformGrid
                 Grid.Row="1"
                 HorizontalAlignment="Center"
+                wd:PanelHelper.Spacing="10"
                 Rows="1">
                 <Button
                     Width="100"
@@ -33,12 +35,11 @@
                     Style="{DynamicResource WD.PrimaryButton}" />
                 <Button
                     Width="100"
-                    Margin="10,0"
                     wd:Badge.FontSize="12"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
-                    wd:Badge.Text="{Binding Text,RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    wd:Badge.Text="{Binding Text, RelativeSource={RelativeSource AncestorType=UserControl}}"
+                    Click="myButton_Click"
                     Content="Success"
-                    Click="myButton_Click" 
                     Style="{DynamicResource WD.SuccessDefaultButton}" />
                 <Button
                     Width="100"
@@ -49,7 +50,6 @@
                     Style="{DynamicResource WD.WarningDefaultButton}" />
                 <Button
                     Width="100"
-                    Margin="10,0"
                     wd:Badge.IsShow="{Binding ElementName=MyBadgeToggleButton, Path=IsChecked}"
                     wd:Badge.Text="NEW"
                     Content="Danger"

From a676306a7e1500b3ca80f417c3b935b83c6c46dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:32:27 +0800
Subject: [PATCH 096/123] Update BasicControlsExample.xaml

---
 .../ExampleViews/BasicControlsExample.xaml          | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index c332ed42..f19d30d8 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -39,15 +39,16 @@
                                 Padding="0,10"
                                 FontSize="20"
                                 Foreground="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
-                                <Hyperlink NavigateUri="https://github.com/yanjinhuagood/WPFDevelopers.Minimal.git" RequestNavigate="GithubHyperlink_RequestNavigate">Github 源码</Hyperlink>
+                                <Hyperlink NavigateUri="https://github.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="GithubHyperlink_RequestNavigate">Github 源码</Hyperlink>
                                 <Run />
                                 <Run />
                                 <Run />
-                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers.Minimal.git" RequestNavigate="GiteeHyperlink_RequestNavigate">码云源码</Hyperlink>
+                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="GiteeHyperlink_RequestNavigate">码云源码</Hyperlink>
                                 <Run />
                                 <Run />
                                 <Run />
-                                <Hyperlink NavigateUri="https://gitee.com/yanjinhua/WPFDevelopers.git" RequestNavigate="QQHyperlink_RequestNavigate">加入QQ群：458041663</Hyperlink>
+                                <Hyperlink NavigateUri="https://gitee.com/WPFDevelopersOrg/WPFDevelopers" RequestNavigate="QQHyperlink_RequestNavigate">加入QQ群：458041663</Hyperlink>
+                                <Hyperlink>、340500857、929469013</Hyperlink>
                             </TextBlock>
                         </StackPanel>
 
@@ -759,12 +760,6 @@
                         Margin="0,10"
                         Columns="2"
                         Rows="2">
-                        <UniformGrid.Resources>
-                            <Style TargetType="{x:Type Rectangle}">
-                                <Setter Property="Width" Value="{x:Static SystemParameters.PrimaryScreenWidth}" />
-                                <Setter Property="Height" Value="400" />
-                            </Style>
-                        </UniformGrid.Resources>
                         <TabControl Margin="4" wd:ElementHelper.CornerRadius="3">
                             <TabItem Padding="10" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />

From ee939560d4c2188c260d3be7152e58e1bcbfd448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:32:37 +0800
Subject: [PATCH 097/123] Update MainWindow.xaml.cs

---
 .../ExampleViews/MainWindow.xaml.cs                          | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml.cs
index 8ccda5b2..5a0e6948 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml.cs
@@ -71,5 +71,10 @@ void Create(double to)
             };
             grayscaleEffect.BeginAnimation(GrayscaleEffect.FactorProperty, doubleAnimation);
         }
+        public void IsTwink()
+        {
+            WpfNotifyIcon.IsTwink = !WpfNotifyIcon.IsTwink;
+            menuItemTwink.IsChecked = WpfNotifyIcon.IsTwink;
+        }
     }
 }

From 2a8f1e49a493df7cb5bc5466ec6dd13efefc5b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:12 +0800
Subject: [PATCH 098/123] Create NotifyIconExample

---
 .../ExampleViews/NotifyIconExample.xaml       | 38 ++++++++++++++++++
 .../ExampleViews/NotifyIconExample.xaml.cs    | 40 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml.cs

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml
new file mode 100644
index 00000000..e71fe019
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml
@@ -0,0 +1,38 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.NotifyIconExample"
+    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>
+        <UniformGrid VerticalAlignment="Center" wd:PanelHelper.Spacing="6">
+            <StackPanel Width="200" wd:PanelHelper.Spacing="3">
+                <TextBox
+                    x:Name="MyTextBox"
+                    wd:ElementHelper.CornerRadius="3"
+                    wd:ElementHelper.IsClear="True"
+                    wd:ElementHelper.Watermark="请输入消息" />
+                <Button
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="BtnNotifyIconMessage_Click"
+                    Content="托盘消息"
+                    Style="{StaticResource WD.SuccessPrimaryButton}" />
+            </StackPanel>
+            <CheckBox
+                wd:ElementHelper.CornerRadius="3"
+                Checked="IsTwink_Checked"
+                Content="开启托盘闪烁"
+                Unchecked="UnIsTwink_Checked" />
+        </UniformGrid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NotifyIconExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/NotifyIconExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml.cs
new file mode 100644
index 00000000..25fc8a9e
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NotifyIconExample.xaml.cs
@@ -0,0 +1,40 @@
+using System.Windows;
+using System.Windows.Controls;
+using WPFDevelopers.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// NotifyIconExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class NotifyIconExample : UserControl
+    {
+        public NotifyIconExample()
+        {
+            InitializeComponent();
+        }
+
+        private void BtnNotifyIconMessage_Click(object sender, RoutedEventArgs e)
+        {
+            var msg = "Welcome to WPFDevelopers ";
+            if (!string.IsNullOrWhiteSpace(MyTextBox.Text))
+                msg = MyTextBox.Text;
+            NotifyIcon.ShowBalloonTip("Message", msg, NotifyIconInfoType.None);
+        }
+
+        private void IsTwink_Checked(object sender, RoutedEventArgs e)
+        {
+            NotifyIconTwink();
+        }
+        private void UnIsTwink_Checked(object sender, RoutedEventArgs e)
+        {
+            NotifyIconTwink();
+        }
+        void NotifyIconTwink()
+        {
+            var mainWindow = Application.Current.MainWindow as MainWindow;
+            if (mainWindow == null) return;
+            mainWindow.IsTwink();
+        }
+    }
+}

From bd6c8a92024d64c60971d8226e62fbee548ad1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:23 +0800
Subject: [PATCH 099/123] Update StarrySkyExample.xaml

---
 .../ExampleViews/StarrySkyExample.xaml        | 132 +++++++++---------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
index b2074cc8..cdd849d2 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
@@ -1,77 +1,77 @@
-<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.StarrySkyExample"
-             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:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.StarrySkyExample"
+    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.Resources>
         <Style TargetType="{x:Type TextBlock}">
-            <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}"></Setter>
-            <Setter Property="FontSize" Value="14"></Setter>
-            <Setter Property="VerticalAlignment" Value="Center"></Setter>
-            <Setter Property="Margin" Value="2"></Setter>
+            <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Margin" Value="2" />
         </Style>
-        <Style TargetType="{x:Type StackPanel}">
-            <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="Margin" Value="-30,0"></Setter>
-            <Setter Property="Width" Value="100"></Setter>
+        <Style BasedOn="{StaticResource {x:Type TextBox}}" TargetType="{x:Type TextBox}">
+            <Setter Property="wd:ElementHelper.Watermark" Value="输入内容" />
+            <Setter Property="wd:ElementHelper.CornerRadius" Value="3" />
+            <Setter Property="Width" Value="100" />
         </Style>
     </UserControl.Resources>
     <controls:CodeViewer>
-    <Grid>
-        <wd:StarrySky Name="myStarrySky">
-
-        </wd:StarrySky>
-        <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="星星个数:"></TextBlock>
-                <TextBox x:Name="tbx_starCount" Text="{Binding ElementName=myStarrySky,Path=StarCount}"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最小尺寸:"></TextBlock>
-                <TextBox Name="tbx_starSizeMin"  Text="{Binding ElementName=myStarrySky,Path=StarSizeMin}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最大尺寸:"></TextBlock>
-                <TextBox Name="tbx_starSizeMax" Text="{Binding ElementName=myStarrySky,Path=StarSizeMax}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最小速度:"></TextBlock>
-                <TextBox Name="tbx_starVMin" Text="{Binding ElementName=myStarrySky,Path=StarVMin}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最大速度:"></TextBlock>
-                <TextBox Name="tbx_starVMax" Text="{Binding ElementName=myStarrySky,Path=StarVMax}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最小转速:"></TextBlock>
-                <TextBox Name="tbx_starRVMin" Text="{Binding ElementName=myStarrySky,Path=StarRVMin}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="最大转速:"></TextBlock>
-                <TextBox Name="tbx_starRVMax" Text="{Binding ElementName=myStarrySky,Path=StarRVMax}"></TextBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-                <TextBlock Text="连线倍率:"></TextBlock>
-                <TextBox Name="tbx_lineRate" Text="{Binding ElementName=myStarrySky,Path=LineRate}"></TextBox>
+        <Grid>
+            <wd:StarrySky Name="myStarrySky" />
+            <StackPanel
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                wd:PanelHelper.Spacing="3">
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="星星个数:" />
+                    <TextBox x:Name="tbx_starCount" Text="{Binding ElementName=myStarrySky, Path=StarCount}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最小尺寸:" />
+                    <TextBox Name="tbx_starSizeMin" Text="{Binding ElementName=myStarrySky, Path=StarSizeMin}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最大尺寸:" />
+                    <TextBox Name="tbx_starSizeMax" Text="{Binding ElementName=myStarrySky, Path=StarSizeMax}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最小速度:" />
+                    <TextBox Name="tbx_starVMin" Text="{Binding ElementName=myStarrySky, Path=StarVMin}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最大速度:" />
+                    <TextBox Name="tbx_starVMax" Text="{Binding ElementName=myStarrySky, Path=StarVMax}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最小转速:" />
+                    <TextBox Name="tbx_starRVMin" Text="{Binding ElementName=myStarrySky, Path=StarRVMin}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="最大转速:" />
+                    <TextBox Name="tbx_starRVMax" Text="{Binding ElementName=myStarrySky, Path=StarRVMax}" />
+                </StackPanel>
+                <StackPanel Orientation="Horizontal">
+                    <TextBlock Text="连线倍率:" />
+                    <TextBox Name="tbx_lineRate" Text="{Binding ElementName=myStarrySky, Path=LineRate}" />
+                </StackPanel>
+                <Button
+                    Name="btn_render"
+                    wd:ElementHelper.CornerRadius="3"
+                    Click="btn_render_Click"
+                    Content="生成" />
             </StackPanel>
-            <Button Name="btn_render" Content="生成" Click="btn_render_Click"/>
-        </StackPanel>
-    </Grid>
+        </Grid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/StarrySkyExample.xaml" 
-                CodeType="Xaml"/>
-            <controls:SourceCodeModel 
-                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/StarrySkyExample.xaml.cs" 
-                CodeType="CSharp"/>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/StarrySkyExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/StarrySkyExample.xaml.cs" CodeType="CSharp" />
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>

From e396eaa050c6eb8acd20a023672fb08288a2017a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:37 +0800
Subject: [PATCH 100/123] Update ScreenCutExample.xaml.cs

---
 .../ExampleViews/ScreenCutExample.xaml.cs           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
index 7a40f5aa..97c4a133 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ScreenCutExample.xaml.cs
@@ -86,9 +86,16 @@ private void ScreenCaptureExt_SnapCompleted(System.Windows.Media.Imaging.BitmapS
 
         private void ScreenCaptureExt_SnapCanceled()
         {
-            if (App.CurrentMainWindow.WindowState == WindowState.Minimized)
-                App.CurrentMainWindow.WindowState = WindowState.Normal;
-            Message.Push($"{DateTime.Now} 取消截图",MessageBoxImage.Information);
+            try
+            {
+                if (App.CurrentMainWindow.WindowState == WindowState.Minimized)
+                    App.CurrentMainWindow.WindowState = WindowState.Normal;
+                Message.Push($"{DateTime.Now} 取消截图", MessageBoxImage.Information);
+            }
+            catch (Exception ex)
+            {
+                WPFDevelopers.Controls.MessageBox.Show(ex.Message);
+            }
         }
     }
 }
\ No newline at end of file

From 03edaead5340311e0ee0d0aa56b0c271071b6c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:45 +0800
Subject: [PATCH 101/123] Update NumericBoxExample.xaml

---
 .../ExampleViews/NumericBoxExample.xaml                          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
index a491b5b5..c06e76b5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/NumericBoxExample.xaml
@@ -15,6 +15,7 @@
             Margin="10"
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
+            wd:PanelHelper.Spacing="6"
             Rows="1">
             <wd:NumericBox
                 Width="100"

From ae706a49110355536f8af8c758f8422d1b98c0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:50 +0800
Subject: [PATCH 102/123] Update TimePickerExample.xaml

---
 .../ExampleViews/TimePickerExample.xaml                          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
index 5a0055a6..9a38db3b 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TimePickerExample.xaml
@@ -28,6 +28,7 @@
             <wd:TimePicker
                 Width="200"
                 VerticalAlignment="Center"
+                wd:ElementHelper.CornerRadius="4"
                 SelectedTime="{Binding MyDateTime, RelativeSource={RelativeSource AncestorType=local:TimePickerExample}}" />
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>

From 63d7bf96cf06a03f05bad2745c3f7f65073376b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:33:59 +0800
Subject: [PATCH 103/123] Update MenuEnum.cs

---
 src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index ada7be99..0968dce8 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -7,6 +7,7 @@ public enum MenuEnum
     {
         Navigation3D,
         BasicControls,
+        NotifyIcon,
         PanningItems,
         BreatheLight,
         RingLoading,

From c16b8350a460f0fa3668cc06e1ba5e50abb33a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:34:13 +0800
Subject: [PATCH 104/123] Update MainVM.cs

---
 src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index c56d638d..f3b5372d 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -121,6 +121,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.BasicControls:
                     ControlPanel = new BasicControlsExample();
                     break;
+                case MenuEnum.NotifyIcon:
+                    ControlPanel = new NotifyIconExample();
+                    break;
                 case MenuEnum.RingLoading:
                     ControlPanel = new RingLoadingExample();
                     break;

From 48e9c3cbfcd01bcea542fd5647cb884dca1f8901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:34:39 +0800
Subject: [PATCH 105/123] Update WPFDevelopers.Samples.Shared.projitems

---
 .../WPFDevelopers.Samples.Shared.projitems                 | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 311d3538..47cb035b 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -297,6 +297,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NoneNoChromeWindow.xaml.cs">
       <DependentUpon>NoneNoChromeWindow.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NotifyIconExample.xaml.cs">
+      <DependentUpon>NotifyIconExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\NumberCard\NumberCardControl.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>NumberCardControl.xaml</DependentUpon>
@@ -804,6 +807,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NotifyIconExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\NumberCard\NumberCardControl.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 82a6462f40c30a5e7efc965869b2a5378dd3d99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:35:46 +0800
Subject: [PATCH 106/123] Update WPFDevelopers.Samples.Shared.projitems

---
 .../WPFDevelopers.Samples.Shared.projitems    | 76 -------------------
 1 file changed, 76 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 47cb035b..c5868753 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -980,82 +980,6 @@
       <SubType>Designer</SubType>
     </Page>
   </ItemGroup>
-  <ItemGroup>
-    <!-- <Compile Remove="emoji\**" /> -->
-    <!-- <Compile Remove="ExampleViews\**" /> -->
-    <!-- <Compile Remove="Images\**" /> -->
-    <!-- <Compile Remove="Resources\**" /> -->
-    <!-- <EmbeddedResource Remove="emoji\**" /> -->
-    <!-- <EmbeddedResource Remove="ExampleViews\**" /> -->
-    <!-- <EmbeddedResource Remove="Images\**" /> -->
-    <!-- <EmbeddedResource Remove="Resources\**" /> -->
-    <!-- <None Remove="emoji\**" /> -->
-    <!-- <None Remove="ExampleViews\**" /> -->
-    <!-- <None Remove="Images\**" /> -->
-    <!-- <None Remove="Resources\**" /> -->
-    <!-- <Page Remove="emoji\**" /> -->
-    <!-- <Page Remove="ExampleViews\**" /> -->
-    <!-- <Page Remove="Images\**" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\**"> -->
-    <!-- <CopyToOutputDirectory>Never</CopyToOutputDirectory> -->
-    <!-- </Resource> -->
-    <!-- <Page Remove="Resources\**" /> -->
-    <!-- <Page Remove="Resources\**" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\发烧.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\大笑.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\得意.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\思考.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\生病.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)emoji\破涕为笑.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\Assets\Lock.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\Assets\Mail.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\Assets\User.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\CustomControl\Image\Clear.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\CustomStyle\Image\Background.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)ExampleViews\LoginWindow\CustomStyle\Image\Logo.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)Resources\Fonts\fixedsys.ttf" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Resources\WPFDevelopers.Minimal.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\AMap\Car2.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\AnimationNavigationBar3D\background.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Breathe\0.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Breathe\1.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Breathe\2.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Chat\Left.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Chat\Right.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Chat\UserImages\jingtao.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Chat\UserImages\yanjinhua.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\1.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\2.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\3.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\4.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\5.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\6.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\7.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\CircularMenu\8.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Craouse\0.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Craouse\1.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Craouse\2.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Craouse\3.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Craouse\4.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Crop\0.jpg" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Passwrod\Eye_50px.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Passwrod\Invisible_50px.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Passwrod\Lock_48px.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\RoundMenu\Close.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\RoundMenu\Color.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\RoundMenu\Eraser.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\RoundMenu\Pen.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\RoundMenu\Revoke.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\Snow\SnowTree.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\SpeedRockets\飞机.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\ZooSemy\0.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Images\ZooSemy\1.png" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)Resources\Audio\HelloWPFDevelopes_en.mp3" /> -->
-    <!-- <Content Include="$(MSBuildThisFileDirectory)Resources\Audio\HelloWPFDevelopes_zh.mp3" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Resources\Fonts\fixedsys.ttf" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)Resources\WPFDevelopers.Minimal.png" /> -->
-    <!-- <Resource Include="$(MSBuildThisFileDirectory)WPFDevelopers.ico" /> -->
-  </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="$(MSBuildThisFileDirectory)App.xaml">
       <SubType>Designer</SubType>

From ac376d2218fd91cdd3fdbb5e9d1e2f4821ff0f1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:36:41 +0800
Subject: [PATCH 107/123] Update WPFDevelopers.SamplesCode.csproj

---
 .../WPFDevelopers.SamplesCode.csproj                          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index ff12b088..2a1d90c9 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -147,6 +147,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\\Loadings\StreamerLoading.cs" Link="Controls\Loadings\StreamerLoading.cs"/>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml.cs" Link="ExampleViews\NotifyIconExample.xaml.cs" DependentUpon="NotifyIconExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -500,5 +501,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml">
 			<Link>ExampleViews\SpacingExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml">
+			<Link>ExampleViews\NotifyIconExample.xaml</Link>
+		</Resource>
 	</ItemGroup>
 </Project>

From 1a0bd1c5dba603840b351163224929692f22db7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:43:02 +0800
Subject: [PATCH 108/123] Update Styles.ComboBox.xaml

---
 src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
index debdf670..d7f35b17 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ComboBox.xaml
@@ -146,7 +146,8 @@
                                 Margin="{TemplateBinding Padding}"
                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Background="{TemplateBinding Background}"
+                                Panel.ZIndex="1"
+                                Background="Transparent"
                                 Focusable="True"
                                 Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
                                 IsReadOnly="{TemplateBinding IsReadOnly}"

From f422b51bdf2f65f9c42d9d925dd13bc704bd718f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:43:12 +0800
Subject: [PATCH 109/123] Update Styles.DatePicker.xaml

---
 .../Styles/Styles.DatePicker.xaml             | 217 ++++--------------
 1 file changed, 50 insertions(+), 167 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
index d10a6ad1..76d48fc3 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
@@ -18,51 +18,37 @@
         <Setter Property="FontSize" Value="12" />
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Padding" Value="1" />
+        <Setter Property="Margin" Value="0,1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarDayButton">
-                    <controls:SmallPanel>
-                        <Ellipse
+                    <controls:SmallPanel Margin="{TemplateBinding Margin}">
+                        <Border
                             x:Name="SelectedBackground"
-                            Margin="{TemplateBinding Padding}"
-                            Opacity="0">
-                            <Ellipse.Fill>
-                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-                            </Ellipse.Fill>
-                        </Ellipse>
-                        <Ellipse
+                            Background="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
+                            Opacity="0" />
+                        <Border
                             x:Name="SelectionBackground"
-                            Margin="{TemplateBinding Padding}"
-                            Opacity="0">
-                            <Ellipse.Fill>
-                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-                            </Ellipse.Fill>
-                        </Ellipse>
+                            Background="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
+                            Opacity="0" />
                         <Border
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}" />
+                            x:Name="HighlightBackground"
+                            Background="{DynamicResource WD.DefaultBackgroundSolidColorBrush}"
+                            Visibility="Collapsed" />
                         <Ellipse
                             x:Name="DayButtonFocusVisual"
                             Width="5"
                             Height="5"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
+                            Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             IsHitTestVisible="False"
-                            Visibility="Collapsed">
-                            <Ellipse.Fill>
-                                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-                            </Ellipse.Fill>
-                        </Ellipse>
+                            Visibility="Collapsed" />
                         <ContentPresenter
                             x:Name="NormalText"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <TextElement.Foreground>
-                                <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-                            </TextElement.Foreground>
-                        </ContentPresenter>
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
                         <Line
                             x:Name="Blackout"
                             Margin="8,3,8,0"
@@ -76,60 +62,6 @@
                             X2="{TemplateBinding Width}"
                             Y1="0"
                             Y2="0" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup Name="CommonStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0:0:0.1" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Normal" />
-                                <VisualState Name="MouseOver" />
-                                <VisualState Name="Pressed" />
-                                <VisualState Name="Disabled" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="SelectionStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Unselected" />
-                                <VisualState Name="Selected">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="SelectionBackground"
-                                            Storyboard.TargetProperty="Opacity"
-                                            To=".3"
-                                            Duration="0" />
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="CalendarButtonFocusStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="CalendarButtonFocused" />
-                                <VisualState Name="CalendarButtonUnfocused" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="ActiveStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Active" />
-                                <VisualState Name="Inactive" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="DayStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="RegularDay" />
-                                <VisualState Name="Today" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="BlackoutDayStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="NormalDay" />
-                                <VisualState Name="BlackoutDay" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsToday" Value="True">
@@ -147,7 +79,6 @@
                                 <Condition Property="IsBlackedOut" Value="False" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-                            <!--<Setter TargetName="DayButtonFocusVisual" Property="Visibility" Value="Collapsed"/>-->
                             <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
                         </MultiTrigger>
                         <MultiTrigger>
@@ -159,7 +90,6 @@
                             <Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
                             <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
                         </MultiTrigger>
-
                         <MultiTrigger>
                             <MultiTrigger.Conditions>
                                 <Condition Property="IsSelected" Value="True" />
@@ -187,6 +117,21 @@
                         <Trigger Property="IsBlackedOut" Value="True">
                             <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
                         </Trigger>
+                        <Trigger Property="helpers:DatePickerHelper.IsHighlight" Value="True">
+                            <Setter TargetName="SelectedBackground" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="SelectionBackground" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
+                            <Setter TargetName="HighlightBackground" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="helpers:DatePickerHelper.IsHighlight" Value="True" />
+                                <Condition Property="IsMouseOver" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
+                            <Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
+                            <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
@@ -206,34 +151,25 @@
             <Setter.Value>
                 <ControlTemplate TargetType="CalendarButton">
                     <controls:SmallPanel>
-                        <Ellipse
+                        <Border
                             x:Name="SelectionBackground"
                             Margin="{TemplateBinding Padding}"
-                            Opacity=".3"
-                            Visibility="Collapsed">
-                            <Ellipse.Fill>
-                                <SolidColorBrush Color="{DynamicResource WD.PrimaryMouseOverColor}" />
-                            </Ellipse.Fill>
-                        </Ellipse>
+                            Background="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
+                            Opacity="0" />
                         <ContentPresenter
                             x:Name="NormalText"
                             Margin="3,20"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
-                            <TextElement.Foreground>
-                                <SolidColorBrush Color="{DynamicResource WD.RegularTextColor}" />
-                            </TextElement.Foreground>
-                        </ContentPresenter>
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            TextElement.Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" />
                         <Ellipse
                             x:Name="ButtonFocusVisual"
                             Width="5"
                             Height="5"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Bottom"
+                            Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             IsHitTestVisible="False">
-                            <Ellipse.Fill>
-                                <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}" />
-                            </Ellipse.Fill>
                             <Ellipse.Visibility>
                                 <MultiBinding Converter="{StaticResource WD.DatePickerToCurrentConverter}">
                                     <Binding ElementName="NormalText" Path="Content" />
@@ -242,62 +178,14 @@
                                 </MultiBinding>
                             </Ellipse.Visibility>
                         </Ellipse>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup Name="CommonStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0:0:0.1" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Normal" />
-                                <VisualState Name="MouseOver">
-                                    <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryMouseOverColor}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState Name="Pressed" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="SelectionStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Unselected" />
-                                <VisualState Name="Selected">
-                                    <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="ActiveStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="Active" />
-                                <VisualState Name="Inactive" />
-                            </VisualStateGroup>
-                            <VisualStateGroup Name="CalendarButtonFocusStates">
-                                <VisualStateGroup.Transitions>
-                                    <VisualTransition GeneratedDuration="0" />
-                                </VisualStateGroup.Transitions>
-                                <VisualState Name="CalendarButtonFocused">
-                                    <Storyboard>
-                                        <ColorAnimationUsingKeyFrames Storyboard.TargetName="NormalText" Storyboard.TargetProperty="(TextElement.Foreground).(SolidColorBrush.Color)">
-                                            <EasingColorKeyFrame KeyTime="0" Value="{DynamicResource WD.PrimaryNormalColor}" />
-                                        </ColorAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState Name="CalendarButtonUnfocused" />
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsInactive" Value="True">
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.BaseSolidColorBrush}" />
                         </Trigger>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="SelectionBackground" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
+                            <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
@@ -419,7 +307,6 @@
         x:Key="WD.CalendarItemStyle"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type CalendarItem}">
-        <Setter Property="Margin" Value="24,4,24,24" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type CalendarItem}">
@@ -444,17 +331,11 @@
                         <Border
                             Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                             BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
-                            BorderThickness="1"
+                            BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource AncestorType=Calendar}}"
                             CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}"
+                            Effect="{StaticResource WD.PopupShadowDepth}"
                             SnapsToDevicePixels="True"
                             UseLayoutRounding="True">
-                            <Border.Effect>
-                                <DropShadowEffect
-                                    BlurRadius="12"
-                                    Opacity="0.1"
-                                    ShadowDepth="2"
-                                    Color="{DynamicResource WD.BlackColor}" />
-                            </Border.Effect>
                             <Grid Margin="0,20,0,0">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
@@ -572,13 +453,16 @@
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="3" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Calendar}">
                     <StackPanel x:Name="PART_Root" HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
                         <CalendarItem
                             x:Name="PART_CalendarItem"
+                            Margin="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
@@ -588,10 +472,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style
-        x:Key="WD.DatePickerCalendarStyle"
-        BasedOn="{StaticResource {x:Type Calendar}}"
-        TargetType="{x:Type Calendar}" />
+
     <Style
         x:Key="WD.DropDownButtonStyle"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
@@ -798,13 +679,11 @@
                                 SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
                             <Popup
                                 x:Name="PART_Popup"
-                                MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
                                 AllowsTransparency="True"
-                                Focusable="False"
-                                HorizontalOffset="-50"
                                 Placement="Bottom"
+                                PlacementTarget="{Binding ElementName=PART_Border}"
                                 StaysOpen="False"
-                                VerticalOffset="2" />
+                                VerticalOffset="-6" />
                         </Grid>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -819,6 +698,10 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <Style
+        x:Key="WD.DatePickerCalendarStyle"
+        BasedOn="{StaticResource {x:Type Calendar}}"
+        TargetType="{x:Type Calendar}" />
     <Style BasedOn="{StaticResource WD.DefaultCalendar}" TargetType="{x:Type Calendar}" />
     <Style BasedOn="{StaticResource WD.DefaultDatePickerTextBox}" TargetType="{x:Type DatePickerTextBox}" />
     <Style BasedOn="{StaticResource WD.DefaultDatePicker}" TargetType="{x:Type DatePicker}" />

From a166a7d5986b877a84302f9a727a8581e6f77fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:45:25 +0800
Subject: [PATCH 110/123] Update Dark.Color.xaml

---
 src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
index f809e0a2..7311b1ce 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
@@ -15,7 +15,7 @@
         po:Freeze="True"
         Color="{StaticResource WD.PrimaryTextColor}" />
 
-    <Color x:Key="WD.RegularTextColor" po:Freeze="True">#FFFFFF</Color>
+    <Color x:Key="WD.RegularTextColor" po:Freeze="True">#C0C4CC</Color>
     <SolidColorBrush
         x:Key="WD.RegularTextSolidColorBrush"
         po:Freeze="True"

From c822468553ae1cecb69f1608b944edf8295cdfe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:45:39 +0800
Subject: [PATCH 111/123] Update Message.xaml

---
 src/WPFDevelopers.Shared/Themes/Message.xaml | 21 ++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index 3bd5f03e..f4e16327 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -23,7 +23,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:MessageListBoxItem}">
                     <ControlTemplate.Resources>
-                        <Storyboard x:Key="Storyboard_Close">
+                        <Storyboard x:Key="Storyboard_Close" DesiredFrameRate="30">
                             <DoubleAnimation
                                 Storyboard.TargetName="PART_SmallPanel"
                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
@@ -37,7 +37,7 @@
                                 To="0"
                                 Duration="0:0:0" />
                         </Storyboard>
-                        <Storyboard x:Key="Storyboard_Loaded">
+                        <Storyboard x:Key="Storyboard_Loaded" DesiredFrameRate="30">
                             <DoubleAnimation
                                 Storyboard.TargetName="PART_SmallPanel"
                                 Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleY)"
@@ -63,11 +63,18 @@
                                 From="1"
                                 To="0"
                                 Duration="0:0:0.2" />
+                            <DoubleAnimation
+                                Storyboard.TargetName="PART_Rectangle"
+                                Storyboard.TargetProperty="(UIElement.RenderTransform).(ScaleTransform.ScaleX)"
+                                From="1"
+                                To="0"
+                                Duration="0:0:10" />
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <controls:SmallPanel
                         x:Name="PART_SmallPanel"
                         Margin="{TemplateBinding Margin}"
+                        CacheMode="BitmapCache"
                         RenderTransformOrigin=".5,0">
                         <controls:SmallPanel.RenderTransform>
                             <ScaleTransform />
@@ -122,6 +129,16 @@
                                 </Button>
                             </Grid>
                         </Border>
+                        <Rectangle
+                            x:Name="PART_Rectangle"
+                            Height="2"
+                            VerticalAlignment="Bottom"
+                            Fill="{Binding ElementName=PART_Path, Path=Fill}"
+                            RenderTransformOrigin="0,0">
+                            <Rectangle.RenderTransform>
+                                <ScaleTransform ScaleX="1" />
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="MessageType" Value="Warning">

From f77e95591c1a8913ca8bdaa9e508466942c377f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:45:51 +0800
Subject: [PATCH 112/123] Update MultiSelectComboBox.xaml

---
 src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
index 5a52b5a9..00704433 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectComboBox.xaml
@@ -105,7 +105,8 @@
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Background="{TemplateBinding Background}"
+                            Panel.ZIndex="1"
+                            Background="Transparent"
                             Focusable="True"
                             Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
                             IsReadOnly="True"
@@ -123,7 +124,7 @@
                             FontSize="{StaticResource WD.NormalFontSize}"
                             Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
                             IsHitTestVisible="False"
-                            Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
+                            Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
                             TextTrimming="CharacterEllipsis"
                             Visibility="Collapsed" />
                         <ToggleButton

From 915cc35da882ee95dc54e21b270300cf24d5fc23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:45:57 +0800
Subject: [PATCH 113/123] Update MultiSelectSearchComboBox.xaml

---
 .../Themes/MultiSelectSearchComboBox.xaml                    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
index ec3c2fa2..0e4a2abc 100644
--- a/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
+++ b/src/WPFDevelopers.Shared/Themes/MultiSelectSearchComboBox.xaml
@@ -55,7 +55,8 @@
                             Margin="{TemplateBinding Padding}"
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            Background="{TemplateBinding Background}"
+                            Panel.ZIndex="1"
+                            Background="Transparent"
                             Focusable="True"
                             Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
                             IsReadOnly="True"
@@ -121,7 +122,7 @@
                                         Margin="6,0"
                                         helpers:ElementHelper.CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                         helpers:ElementHelper.IsClear="True"
-                                        helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}}" />
+                                        helpers:ElementHelper.Watermark="{Binding SearchWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}" />
                                     <CheckBox
                                         x:Name="PART_SelectAll"
                                         Grid.Row="1"

From 345c542c5ff608f389fcde03e1808e363b30ef2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:46:06 +0800
Subject: [PATCH 114/123] Update ScreenCut.xaml

---
 src/WPFDevelopers.Shared/Themes/ScreenCut.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index 29f60eda..3e67ad27 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -182,7 +182,7 @@
                                     x:Name="PART_PopupBorder"
                                     Margin="10,30,10,10"
                                     Background="{DynamicResource WD.BackgroundSolidColorBrush}"
-                                    CornerRadius="{Binding Path=(helpers:ControlsHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                                     Effect="{StaticResource WD.PopupShadowDepth}">
                                     <controls:SmallPanel>
                                         <Path

From 2f86b562ef8da3e6d2eadcfb4859fd84ab159ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Thu, 17 Oct 2024 21:46:19 +0800
Subject: [PATCH 115/123] Update TimePicker.xaml

---
 .../Themes/TimePicker.xaml                    | 181 +++++++++---------
 1 file changed, 94 insertions(+), 87 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/TimePicker.xaml b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
index c82e6c92..1b6db6b0 100644
--- a/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
+++ b/src/WPFDevelopers.Shared/Themes/TimePicker.xaml
@@ -12,16 +12,28 @@
         <Border
             x:Name="PART_Border"
             Padding="6,0"
-            Background="Transparent"
             BorderThickness="0"
             SnapsToDevicePixels="true">
-            <controls:PathIcon
-                x:Name="PART_PathIcon"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
-                IsHitTestVisible="False"
-                Kind="Time" />
+            <Grid Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="30" />
+                </Grid.ColumnDefinitions>
+                <Rectangle
+                    Grid.Column="1"
+                    Width="30"
+                    Height="Auto"
+                    Margin="0,1"
+                    Fill="{TemplateBinding Background}" />
+                <controls:PathIcon
+                    x:Name="PART_PathIcon"
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Foreground="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
+                    IsHitTestVisible="False"
+                    Kind="Time" />
+            </Grid>
         </Border>
         <ControlTemplate.Triggers>
             <Trigger Property="IsMouseOver" Value="True">
@@ -157,81 +169,76 @@
                         </Storyboard>
                     </ControlTemplate.Resources>
                     <controls:SmallPanel SnapsToDevicePixels="True">
-                        <Grid Background="Transparent">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <Border
-                                Name="PART_Border"
-                                Grid.ColumnSpan="2"
-                                Background="{TemplateBinding Background}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="{TemplateBinding BorderThickness}"
-                                CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                SnapsToDevicePixels="True" />
-                            <TextBox
-                                x:Name="PART_EditableTextBox"
-                                Margin="{TemplateBinding Padding}"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Background="{TemplateBinding Background}"
-                                Focusable="True"
-                                Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
-                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
-                                Style="{x:Null}"
-                                Template="{StaticResource WD.ComboBoxTextBox}" />
-                            <TextBlock
-                                x:Name="PART_Watermark"
-                                Margin="{TemplateBinding Padding}"
-                                Padding="1,0"
-                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                Background="Transparent"
-                                FontSize="{StaticResource WD.NormalFontSize}"
-                                Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
-                                IsHitTestVisible="False"
-                                Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
-                                TextTrimming="CharacterEllipsis"
-                                Visibility="Collapsed" />
-                            <ToggleButton
-                                x:Name="PART_ToggleButton"
-                                Grid.Column="1"
-                                Background="{TemplateBinding Background}"
-                                ClickMode="Release"
-                                Focusable="False"
-                                Style="{x:Null}"
-                                Template="{StaticResource WD.TimePickerToggleButton}" />
-                            <Popup
-                                x:Name="PART_Popup"
-                                AllowsTransparency="True"
-                                IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}"
-                                Placement="Bottom"
-                                PlacementTarget="{Binding ElementName=PART_Border}"
-                                StaysOpen="False">
-                                <controls:SmallPanel
-                                    x:Name="PART_DropDown"
-                                    MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
-                                    MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                                    Margin="24,2,24,24"
-                                    RenderTransformOrigin=".5,0"
-                                    SnapsToDevicePixels="True">
-                                    <controls:SmallPanel.RenderTransform>
-                                        <ScaleTransform ScaleY="0" />
-                                    </controls:SmallPanel.RenderTransform>
-                                    <Border
-                                        Name="PART_DropDownBorder"
-                                        Background="{TemplateBinding Background}"
-                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                                        Effect="{StaticResource WD.PopupShadowDepth}"
-                                        SnapsToDevicePixels="True"
-                                        UseLayoutRounding="True" />
-                                    <controls:TimeSelector x:Name="PART_TimeSelector" />
-                                </controls:SmallPanel>
-                            </Popup>
-                        </Grid>
+                        <Border
+                            Name="PART_Border"
+                            Grid.ColumnSpan="2"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            SnapsToDevicePixels="True" />
+                        <TextBox
+                            x:Name="PART_EditableTextBox"
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Panel.ZIndex="1"
+                            Background="Transparent"
+                            Focusable="True"
+                            Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                            SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}"
+                            Style="{x:Null}"
+                            Template="{StaticResource WD.ComboBoxTextBox}" />
+                        <TextBlock
+                            x:Name="PART_Watermark"
+                            Margin="{TemplateBinding Padding}"
+                            Padding="1,0"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Background="Transparent"
+                            FontSize="{StaticResource WD.NormalFontSize}"
+                            Foreground="{DynamicResource WD.RegularTextSolidColorBrush}"
+                            IsHitTestVisible="False"
+                            Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
+                            TextTrimming="CharacterEllipsis"
+                            Visibility="Collapsed" />
+                        <ToggleButton
+                            x:Name="PART_ToggleButton"
+                            Grid.Column="1"
+                            Background="{TemplateBinding Background}"
+                            ClickMode="Release"
+                            Focusable="False"
+                            Style="{x:Null}"
+                            Template="{StaticResource WD.TimePickerToggleButton}" />
+                        <Popup
+                            x:Name="PART_Popup"
+                            AllowsTransparency="True"
+                            IsOpen="{Binding Path=IsChecked, ElementName=PART_ToggleButton}"
+                            Placement="Bottom"
+                            PlacementTarget="{Binding ElementName=PART_Border}"
+                            StaysOpen="False">
+                            <controls:SmallPanel
+                                x:Name="PART_DropDown"
+                                MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Margin="24,2,24,24"
+                                RenderTransformOrigin=".5,0"
+                                SnapsToDevicePixels="True">
+                                <controls:SmallPanel.RenderTransform>
+                                    <ScaleTransform ScaleY="0" />
+                                </controls:SmallPanel.RenderTransform>
+                                <Border
+                                    Name="PART_DropDownBorder"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                    Effect="{StaticResource WD.PopupShadowDepth}"
+                                    SnapsToDevicePixels="True"
+                                    UseLayoutRounding="True" />
+                                <controls:TimeSelector x:Name="PART_TimeSelector" />
+                            </controls:SmallPanel>
+                        </Popup>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger SourceName="PART_ToggleButton" Property="IsChecked" Value="True">
@@ -256,12 +263,12 @@
                         <Trigger SourceName="PART_Popup" Property="AllowsTransparency" Value="True">
                             <Setter TargetName="PART_DropDownBorder" Property="Margin" Value="0,2,0,0" />
                         </Trigger>
-                        <Trigger Property="SelectedTime" Value="">
+                        <DataTrigger Binding="{Binding ElementName=PART_EditableTextBox, Path=Text}" Value="{x:Null}">
                             <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger Property="SelectedTime" Value="{x:Null}">
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding ElementName=PART_EditableTextBox, Path=Text}" Value="">
                             <Setter TargetName="PART_Watermark" Property="Visibility" Value="Visible" />
-                        </Trigger>
+                        </DataTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

From 484f8bf2a6c1d58d50332b9ec51ce246070c3455 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 21 Oct 2024 23:24:19 +0800
Subject: [PATCH 116/123] Fix Issue (#113)

Fix Issue (#113)
---
 .../Styles/Styles.TabControl.xaml             | 103 +++---------------
 1 file changed, 13 insertions(+), 90 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
index 25873218..03820288 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -20,14 +20,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabItem}">
                     <controls:SmallPanel Background="{TemplateBinding Background}">
-                        <Border
-                            x:Name="PART_Border"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            RenderTransformOrigin=".5,.5">
-                            <Border.RenderTransform>
-                                <ScaleTransform ScaleX="0" ScaleY="1" />
-                            </Border.RenderTransform>
-                        </Border>
+                        <Border x:Name="PART_Border" BorderThickness="{TemplateBinding BorderThickness}" />
                         <ContentPresenter
                             x:Name="PART_ContentPresenter"
                             Margin="{TemplateBinding Padding}"
@@ -35,20 +28,6 @@
                             VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
                             ContentSource="Header"
                             SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="SelectionStates">
-                                <VisualState x:Name="Unselected" />
-                                <VisualState x:Name="Selected">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="PART_Border"
-                                            Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleX)"
-                                            To="1"
-                                            Duration="00:00:.2" />
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsSelected" Value="True">
@@ -65,74 +44,15 @@
         </Setter>
     </Style>
 
-    <Style
-        x:Key="WD.BaseLAndRTabItem"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type TabItem}">
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
-        <Setter Property="BorderThickness" Value="{StaticResource WD.TabItemBorderThickness}" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TabItem}">
-                    <controls:SmallPanel Background="{TemplateBinding Background}">
-                        <Border
-                            x:Name="PART_Border"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            RenderTransformOrigin=".5,.5">
-                            <Border.RenderTransform>
-                                <ScaleTransform ScaleX="1" ScaleY="0" />
-                            </Border.RenderTransform>
-                        </Border>
-                        <ContentPresenter
-                            x:Name="PART_ContentPresenter"
-                            Margin="{TemplateBinding Padding}"
-                            HorizontalAlignment="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            VerticalAlignment="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
-                            ContentSource="Header"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="SelectionStates">
-                                <VisualState x:Name="Unselected" />
-                                <VisualState x:Name="Selected">
-                                    <Storyboard>
-                                        <DoubleAnimation
-                                            Storyboard.TargetName="PART_Border"
-                                            Storyboard.TargetProperty="(Border.RenderTransform).(ScaleTransform.ScaleY)"
-                                            To="1"
-                                            Duration="00:00:.2" />
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </controls:SmallPanel>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="PART_Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
     <Style
         x:Key="WD.LeftTabItem"
-        BasedOn="{StaticResource WD.BaseLAndRTabItem}"
+        BasedOn="{StaticResource WD.BaseTAndBTabItem}"
         TargetType="{x:Type TabItem}">
         <Setter Property="BorderThickness" Value="0,0,2,0" />
     </Style>
     <Style
         x:Key="WD.RightTabItem"
-        BasedOn="{StaticResource WD.BaseLAndRTabItem}"
+        BasedOn="{StaticResource WD.BaseTAndBTabItem}"
         TargetType="{x:Type TabItem}">
         <Setter Property="BorderThickness" Value="2,0,0,0" />
     </Style>
@@ -170,14 +90,17 @@
                         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}">
+                        <Grid
+                            Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
+                            KeyboardNavigation.TabNavigation="Local"
+                            SnapsToDevicePixels="True">
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Name="ColumnDefinition0" />
-                                <ColumnDefinition Name="ColumnDefinition1" Width="0" />
+                                <ColumnDefinition x:Name="ColumnDefinition0" />
+                                <ColumnDefinition x:Name="ColumnDefinition1" Width="0" />
                             </Grid.ColumnDefinitions>
                             <Grid.RowDefinitions>
-                                <RowDefinition Name="RowDefinition0" Height="Auto" />
-                                <RowDefinition Name="RowDefinition1" Height="*" />
+                                <RowDefinition x:Name="RowDefinition0" Height="Auto" />
+                                <RowDefinition x:Name="RowDefinition1" Height="*" />
                             </Grid.RowDefinitions>
                             <Border
                                 x:Name="HeaderBorder"
@@ -223,10 +146,10 @@
                             <Setter Property="ItemContainerStyle" Value="{StaticResource WD.BottomTabItem}" />
                         </Trigger>
                         <Trigger Property="TabControl.TabStripPlacement" Value="Left">
-                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
-                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="1" />
                             <Setter TargetName="ColumnDefinition0" Property="ColumnDefinition.Width" Value="Auto" />
                             <Setter TargetName="ColumnDefinition1" Property="ColumnDefinition.Width" Value="*" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
+                            <Setter TargetName="ContentPanel" Property="Grid.Column" Value="1" />
                             <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" />

From 3f6b4b08b0cb2068239c183ffbefec05637ce780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 29 Oct 2024 22:43:00 +0800
Subject: [PATCH 117/123] Fix Issue (#112 )

Fix Issue (#112 )
---
 .../Controls/ScreenCut/ScreenCaptureExt.cs                    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
index 543ff78e..4e14739a 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
@@ -53,13 +53,13 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
             switch (msg)
             {
                 case Helper.WM_USER:
-                    GetClipboard();
                     Close();
+                    GetClipboard();
                     break;
                 case Helper.MY_MESSAGE:
+                    Close();
                     if (SnapCanceled != null) 
                         SnapCanceled();
-                    Close();
                     break;
             }
             return IntPtr.Zero;

From 93f04ab276655e21e5225e1002ee1e900114131a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sat, 2 Nov 2024 20:27:08 +0800
Subject: [PATCH 118/123] =?UTF-8?q?Fix=20Issue=20=EF=BC=88#114=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix Issue （#114 ）
---
 src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
index 76d48fc3..75350143 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
@@ -117,7 +117,7 @@
                         <Trigger Property="IsBlackedOut" Value="True">
                             <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
                         </Trigger>
-                        <Trigger Property="helpers:DatePickerHelper.IsHighlight" Value="True">
+                        <!--<Trigger Property="helpers:DatePickerHelper.IsHighlight" Value="True">
                             <Setter TargetName="SelectedBackground" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="SelectionBackground" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
@@ -131,7 +131,7 @@
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                             <Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
                             <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
-                        </MultiTrigger>
+                        </MultiTrigger>-->
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>

From 9d8eaec376ae86da8cae744b9b965cad4f77d022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 5 Nov 2024 20:14:12 +0800
Subject: [PATCH 119/123] add in DrawerMenu Example

add in DrawerMenu Example
---
 .../DrawerMenu/DrawerMenuExample.xaml         | 102 +++++++++---------
 .../DrawerMenu/DrawerMenuExample.xaml.cs      |  23 +++-
 2 files changed, 73 insertions(+), 52 deletions(-)

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
index 1f6c98ae..c3e026d7 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
@@ -11,54 +11,60 @@
     d:DesignWidth="800"
     mc:Ignorable="d">
     <controls:CodeViewer>
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <Frame
-                Name="myFrame"
-                Grid.Column="1"
-                NavigationUIVisibility="Hidden" />
-            <wd:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
-                <wd:DrawerMenuItem Text="主页">
-                    <wd: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>
-                        <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/4.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="云盘">
-                    <wd: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>
-                        <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/8.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="视频">
-                    <wd: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>
-                        <Path
-                            Width="20"
-                            Height="20"
-                            Data="{StaticResource WD.BusGeometry}"
-                            Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
-                            Stretch="Uniform" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-            </wd:DrawerMenu>
-
-        </Grid>
+        <TabControl>
+            <TabItem Header="DrawerMenu - Xaml">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Frame
+                        Name="myFrame"
+                        Grid.Column="1"
+                        NavigationUIVisibility="Hidden" />
+                    <wd:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
+                        <wd:DrawerMenuItem Text="主页">
+                            <wd: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>
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/4.png" />
+                            </wd:DrawerMenuItem.Icon>
+                        </wd:DrawerMenuItem>
+                        <wd:DrawerMenuItem Text="云盘">
+                            <wd: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>
+                                <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/8.png" />
+                            </wd:DrawerMenuItem.Icon>
+                        </wd:DrawerMenuItem>
+                        <wd:DrawerMenuItem Text="视频">
+                            <wd: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>
+                                <Path
+                                    Width="20"
+                                    Height="20"
+                                    Data="{StaticResource WD.BusGeometry}"
+                                    Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
+                                    Stretch="Uniform" />
+                            </wd:DrawerMenuItem.Icon>
+                        </wd:DrawerMenuItem>
+                    </wd:DrawerMenu>
+                </Grid>
+            </TabItem>
+            <TabItem Header="DrawerMenu binding">
+                <wd:DrawerMenu ItemsSource="{Binding DrawerMenuItems, RelativeSource={RelativeSource AncestorType=local:DrawerMenuExample}}" />
+            </TabItem>
+        </TabControl>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DrawerMenu/DrawerMenuExample.xaml" CodeType="Xaml" />
             <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs" CodeType="CSharp" />
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
index 0cdf07fa..2b81fad0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
-using WPFDevelopers.Samples.Helpers;
+using System.Windows.Media.Imaging;
+using WPFDevelopers.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews.DrawerMenu
 {
@@ -19,9 +17,26 @@ public partial class DrawerMenuExample : UserControl
             new Uri("pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/DrawerMenu/HomePage.xaml",UriKind.Absolute),
             new Uri("pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/DrawerMenu/EdgePage.xaml",UriKind.Absolute),
         };
+
+
+        public IList<DrawerMenuItem> DrawerMenuItems
+        {
+            get { return (IList<DrawerMenuItem>)GetValue(DrawerMenuItemsProperty); }
+            set { SetValue(DrawerMenuItemsProperty, value); }
+        }
+
+        public static readonly DependencyProperty DrawerMenuItemsProperty =
+            DependencyProperty.Register("DrawerMenuItems", typeof(IList<DrawerMenuItem>), typeof(DrawerMenuExample), new PropertyMetadata(null));
+
+
         public DrawerMenuExample()
         {
             InitializeComponent();
+            var items = new List<DrawerMenuItem>();
+            items.Add(new DrawerMenuItem { Text = "Menu01", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/1.png")) } });
+            items.Add(new DrawerMenuItem { Text = "Menu02", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/2.png")) } });
+            items.Add(new DrawerMenuItem { Text = "Menu03", Icon = new Image() { Source = new BitmapImage(new Uri($"pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/3.png")) } });
+            DrawerMenuItems = items;
         }
 
         //public ICommand HomeCommand => new RelayCommand(obj =>

From bc0d44ef88b584824a36c29ac61f3714a7f168c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Tue, 5 Nov 2024 20:26:04 +0800
Subject: [PATCH 120/123] add in Drawer

add in Drawer
---
 .../ExampleViews/DrawerExample.xaml           | 151 +++++++++++++++
 .../ExampleViews/DrawerExample.xaml.cs        |  37 ++++
 .../Helpers/MenuEnum.cs                       |   1 +
 .../ViewModels/MainVM.cs                      |   3 +
 .../WPFDevelopers.Samples.Shared.projitems    |   7 +
 .../WPFDevelopers.SamplesCode.csproj          |   4 +
 .../Controls/Drawer/Drawer.cs                 | 175 ++++++++++++++++++
 src/WPFDevelopers.Shared/Controls/Position.cs |  10 +
 src/WPFDevelopers.Shared/Themes/Drawer.xaml   |  66 +++++++
 .../WPFDevelopers.Shared.projitems            |   6 +
 10 files changed, 460 insertions(+)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/Position.cs
 create mode 100644 src/WPFDevelopers.Shared/Themes/Drawer.xaml

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml
new file mode 100644
index 00000000..777f72f9
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml
@@ -0,0 +1,151 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.DrawerExample"
+    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>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <wd:Drawer
+                x:Name="MyDrawerTop"
+                Margin="2"
+                Position="Top">
+                <wd:Drawer.Header>
+                    <Grid Height="120">
+                        <StackPanel HorizontalAlignment="Center">
+                            <TextBlock FontSize="18" Text="Drawer" />
+                            <Button HorizontalAlignment="Center" Content="contents..." />
+                        </StackPanel>
+                    </Grid>
+                </wd:Drawer.Header>
+                <wd:Drawer.Content>
+                    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Bottom">
+                        <TextBlock Text="抽屉从顶部置滑出，点击遮罩区关闭。" />
+                        <Button
+                            Margin="0,10"
+                            HorizontalAlignment="Center"
+                            Click="ButtonTop_Click"
+                            Content="Open"
+                            Style="{StaticResource WD.PrimaryButton}" />
+                    </StackPanel>
+                </wd:Drawer.Content>
+            </wd:Drawer>
+            <wd:Drawer
+                x:Name="MyDrawerBottom"
+                Grid.Column="1"
+                Margin="2"
+                wd:ElementHelper.CornerRadius="3"
+                Position="Bottom">
+                <wd:Drawer.Header>
+                    <Grid Height="130">
+                        <StackPanel HorizontalAlignment="Center">
+                            <TextBlock FontSize="18" Text="Drawer" />
+                            <Button
+                                HorizontalAlignment="Center"
+                                wd:ElementHelper.CornerRadius="3"
+                                Content="contents..."
+                                Style="{StaticResource WD.DangerDefaultButton}" />
+                        </StackPanel>
+                    </Grid>
+                </wd:Drawer.Header>
+                <wd:Drawer.Content>
+                    <StackPanel HorizontalAlignment="Center">
+                        <TextBlock Text="抽屉从底部滑出，点击遮罩区关闭。" />
+                        <Button
+                            Margin="0,10"
+                            HorizontalAlignment="Center"
+                            wd:ElementHelper.CornerRadius="3"
+                            Click="ButtonBottom_Click"
+                            Content="Open"
+                            Style="{StaticResource WD.DangerPrimaryButton}" />
+                    </StackPanel>
+                </wd:Drawer.Content>
+            </wd:Drawer>
+
+            <wd:Drawer
+                x:Name="MyDrawerLeft"
+                Grid.Row="1"
+                Margin="2"
+                wd:ElementHelper.CornerRadius="3"
+                Position="Left">
+                <wd:Drawer.Header>
+                    <Grid Width="140" Background="HotPink">
+                        <StackPanel>
+                            <TextBlock
+                                HorizontalAlignment="Center"
+                                FontSize="18"
+                                Text="Drawer" />
+                            <Button
+                                HorizontalAlignment="Center"
+                                wd:ElementHelper.CornerRadius="3"
+                                Content="contents..."
+                                Style="{StaticResource WD.SuccessDefaultButton}" />
+                        </StackPanel>
+                    </Grid>
+                </wd:Drawer.Header>
+                <wd:Drawer.Content>
+                    <StackPanel HorizontalAlignment="Center">
+                        <TextBlock Text="抽屉从左侧滑出，点击遮罩区关闭。" />
+                        <Button
+                            Margin="0,10"
+                            HorizontalAlignment="Center"
+                            wd:ElementHelper.CornerRadius="3"
+                            Click="ButtonLeft_Click"
+                            Content="Open"
+                            Style="{StaticResource WD.SuccessPrimaryButton}" />
+                    </StackPanel>
+                </wd:Drawer.Content>
+            </wd:Drawer>
+            <wd:Drawer
+                x:Name="MyDrawerRight"
+                Grid.Row="1"
+                Grid.Column="1"
+                Margin="2"
+                Position="Right">
+                <wd:Drawer.Header>
+                    <Grid Width="100">
+                        <StackPanel HorizontalAlignment="Center">
+                            <TextBlock
+                                HorizontalAlignment="Center"
+                                FontSize="18"
+                                Text="Drawer" />
+                            <Button
+                                HorizontalAlignment="Center"
+                                Content="contents..."
+                                Style="{StaticResource WD.WarningDefaultButton}" />
+                        </StackPanel>
+                    </Grid>
+                </wd:Drawer.Header>
+                <wd:Drawer.Content>
+                    <StackPanel HorizontalAlignment="Center">
+                        <TextBlock Text="抽屉从右侧滑出，点击遮罩区关闭。" />
+                        <Button
+                            Margin="0,10"
+                            HorizontalAlignment="Center"
+                            Click="ButtonRight_Click"
+                            Content="Open"
+                            Style="{StaticResource WD.WarningPrimaryButton}" />
+                    </StackPanel>
+                </wd:Drawer.Content>
+            </wd:Drawer>
+        </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DrawerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DrawerExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml.cs
new file mode 100644
index 00000000..87ecd8fa
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerExample.xaml.cs
@@ -0,0 +1,37 @@
+using System.Windows;
+using System;
+using System.Windows.Controls;
+using System.Windows.Media.Animation;
+using System.Windows.Media;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// DrawerExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class DrawerExample : UserControl
+    {
+        public DrawerExample()
+        {
+            InitializeComponent();
+        }
+
+        private void ButtonTop_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            MyDrawerTop.IsOpen = true;
+        }
+
+        private void ButtonBottom_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            MyDrawerBottom.IsOpen = true;
+        }
+        private void ButtonLeft_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            MyDrawerLeft.IsOpen = true;
+        }
+        private void ButtonRight_Click(object sender, System.Windows.RoutedEventArgs e)
+        {
+            MyDrawerRight.IsOpen = true;
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index 0968dce8..f7204688 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -85,6 +85,7 @@ public enum MenuEnum
         Drap,
         ChartPie,
         Spacing,
+        Drawer,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index f3b5372d..b48269c0 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -358,6 +358,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Spacing:
                     ControlPanel = new SpacingExample();
                     break;
+                case MenuEnum.Drawer:
+                    ControlPanel = new DrawerExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index c5868753..8146f9f0 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -173,6 +173,9 @@
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\DrapViewExample.xaml.cs">
       <DependentUpon>DrapViewExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerExample.xaml.cs">
+      <DependentUpon>DrawerExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerMenu\DrawerMenuExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>DrawerMenuExample.xaml</DependentUpon>
@@ -662,6 +665,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerMenu\DrawerMenuExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 2a1d90c9..aab117c2 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -145,6 +145,7 @@
 		<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" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DrawerExample.xaml.cs" Link="ExampleViews\DrawerExample.xaml.cs" DependentUpon="DrawerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\\Loadings\StreamerLoading.cs" Link="Controls\Loadings\StreamerLoading.cs"/>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml.cs" Link="ExampleViews\NotifyIconExample.xaml.cs" DependentUpon="NotifyIconExample.xaml" />
@@ -495,6 +496,9 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml">
 			<Link>ExampleViews\ChartPieExample.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DrawerExample.xaml">
+			<Link>ExampleViews\DrawerExample.xaml</Link>
+		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\Loadings\StreamerLoading.xaml">
 			<Link>Controls\Loadings\StreamerLoading.xaml</Link>
 		</Resource>
diff --git a/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs b/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
new file mode 100644
index 00000000..24784596
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Drawer/Drawer.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = BorderHeaderTemplateName, Type = typeof(Border))]
+    [TemplatePart(Name = BorderMarkTemplateName, Type = typeof(Border))]
+    public class Drawer : HeaderedContentControl
+    {
+        private const string BorderHeaderTemplateName = "PART_Header";
+        private const string BorderMarkTemplateName = "PART_Mark";
+
+        public static readonly DependencyProperty EdgePositionProperty =
+            DependencyProperty.Register("Position", typeof(Position), typeof(Drawer),
+                new PropertyMetadata(Position.Left));
+
+        public static readonly DependencyProperty IsOpenProperty =
+            DependencyProperty.Register("IsOpen", typeof(bool), typeof(Drawer),
+                new PropertyMetadata(false, OnIsOpenChanged));
+
+        private Storyboard _enterStoryboard;
+        private Storyboard _exitStoryboard;
+
+        private Border _headerBorder;
+        private double _headerHeight;
+        private double _headerWidth;
+        private Border _markBorder;
+
+        static Drawer()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(Drawer), new FrameworkPropertyMetadata(typeof(Drawer)));
+        }
+
+        public Position Position
+        {
+            get => (Position) GetValue(EdgePositionProperty);
+            set => SetValue(EdgePositionProperty, value);
+        }
+
+        public bool IsOpen
+        {
+            get => (bool) GetValue(IsOpenProperty);
+            set => SetValue(IsOpenProperty, value);
+        }
+
+        private static void OnIsOpenChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as Drawer;
+            if (ctrl != null)
+            {
+                if (ctrl.IsOpen)
+                {
+                    ctrl._headerBorder.Visibility = Visibility.Visible;
+                    ctrl._enterStoryboard.Begin();
+                }
+                else
+                {
+                    ctrl._exitStoryboard.Begin();
+                }
+            }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            _headerBorder = GetTemplateChild(BorderHeaderTemplateName) as Border;
+            if (_headerBorder != null)
+                _headerBorder.Loaded += HeaderBorder_Loaded;
+            _markBorder = GetTemplateChild(BorderMarkTemplateName) as Border;
+            if (_markBorder != null)
+                _markBorder.MouseDown += MarkBorder_MouseDown;
+        }
+
+        private void MarkBorder_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            IsOpen = false;
+        }
+
+        private void HeaderBorder_Loaded(object sender, RoutedEventArgs e)
+        {
+            TranslateTransform translateTransform;
+            DoubleAnimation animation, exitAnimation;
+            switch (Position)
+            {
+                case Position.Left:
+                case Position.Right:
+                    _headerWidth = _headerBorder.ActualWidth;
+                    if (Position == Position.Left)
+                        translateTransform = new TranslateTransform(-_headerWidth, 0);
+                    else
+                        translateTransform = new TranslateTransform(_headerWidth, 0);
+                    _headerBorder.RenderTransform = new TransformGroup
+                    {
+                        Children = new TransformCollection {translateTransform}
+                    };
+                    animation = new DoubleAnimation
+                    {
+                        From = Position == Position.Left ? -_headerWidth : _headerWidth,
+                        To = 0,
+                        Duration = TimeSpan.FromMilliseconds(300)
+                    };
+
+                    Storyboard.SetTarget(animation, _headerBorder);
+                    Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Children[0].X"));
+                    _enterStoryboard = new Storyboard();
+                    _enterStoryboard.Children.Add(animation);
+
+                    exitAnimation = new DoubleAnimation
+                    {
+                        From = 0,
+                        To = Position == Position.Left ? -_headerWidth : _headerWidth,
+                        Duration = TimeSpan.FromMilliseconds(300)
+                    };
+
+                    Storyboard.SetTarget(exitAnimation, _headerBorder);
+                    Storyboard.SetTargetProperty(exitAnimation, new PropertyPath("RenderTransform.Children[0].X"));
+                    _exitStoryboard = new Storyboard();
+                    _exitStoryboard.Completed += delegate
+                    {
+                        if (!IsOpen)
+                            _headerBorder.Visibility = Visibility.Collapsed;
+                    };
+                    _exitStoryboard.Children.Add(exitAnimation);
+                    break;
+                case Position.Top:
+                case Position.Bottom:
+                    _headerHeight = _headerBorder.ActualHeight;
+                    if (Position == Position.Top)
+                        translateTransform = new TranslateTransform(0, -_headerHeight);
+                    else
+                        translateTransform = new TranslateTransform(0, _headerHeight);
+                    _headerBorder.RenderTransform = new TransformGroup
+                    {
+                        Children = new TransformCollection {translateTransform}
+                    };
+                    animation = new DoubleAnimation
+                    {
+                        From = Position == Position.Top ? -_headerHeight : _headerHeight,
+                        To = 0,
+                        Duration = TimeSpan.FromMilliseconds(300)
+                    };
+
+                    Storyboard.SetTarget(animation, _headerBorder);
+                    Storyboard.SetTargetProperty(animation, new PropertyPath("RenderTransform.Children[0].Y"));
+                    _enterStoryboard = new Storyboard();
+                    _enterStoryboard.Children.Add(animation);
+
+                    exitAnimation = new DoubleAnimation
+                    {
+                        From = 0,
+                        To = Position == Position.Top ? -_headerHeight : _headerHeight,
+                        Duration = TimeSpan.FromMilliseconds(300)
+                    };
+
+                    Storyboard.SetTarget(exitAnimation, _headerBorder);
+                    Storyboard.SetTargetProperty(exitAnimation, new PropertyPath("RenderTransform.Children[0].Y"));
+                    _exitStoryboard = new Storyboard();
+                    _exitStoryboard.Completed += delegate
+                    {
+                        if (!IsOpen)
+                            _headerBorder.Visibility = Visibility.Collapsed;
+                    };
+                    _exitStoryboard.Children.Add(exitAnimation);
+                    break;
+            }
+
+            _headerBorder.Visibility = Visibility.Collapsed;
+            _headerBorder.Loaded -= HeaderBorder_Loaded;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Position.cs b/src/WPFDevelopers.Shared/Controls/Position.cs
new file mode 100644
index 00000000..1eec81b6
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/Position.cs
@@ -0,0 +1,10 @@
+namespace WPFDevelopers.Controls
+{
+    public enum Position
+    {
+        Left,
+        Top,
+        Right,
+        Bottom
+    }
+}
diff --git a/src/WPFDevelopers.Shared/Themes/Drawer.xaml b/src/WPFDevelopers.Shared/Themes/Drawer.xaml
new file mode 100644
index 00000000..972a7850
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/Drawer.xaml
@@ -0,0 +1,66 @@
+<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">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <Style
+        x:Key="WD.Drawer"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:Drawer}">
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:Drawer}">
+                    <controls:WDBorder
+                        x:Name="Border"
+                        Margin="{TemplateBinding Margin}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                        SnapsToDevicePixels="True">
+                        <controls:SmallPanel Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}">
+                            <Border x:Name="PART_Content">
+                                <ContentPresenter Content="{TemplateBinding Content}" />
+                            </Border>
+                            <Border
+                                x:Name="PART_Mark"
+                                Background="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                                Opacity=".5" />
+                            <Border
+                                x:Name="PART_Header"
+                                HorizontalAlignment="Left"
+                                Background="{TemplateBinding Background}"
+                                Effect="{StaticResource WD.NormalShadowDepth}">
+                                <ContentPresenter Content="{TemplateBinding Header}" />
+                            </Border>
+                        </controls:SmallPanel>
+                    </controls:WDBorder>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="Position" Value="Top">
+                            <Setter TargetName="PART_Header" Property="HorizontalAlignment" Value="Stretch" />
+                            <Setter TargetName="PART_Header" Property="VerticalAlignment" Value="Top" />
+                        </Trigger>
+                        <Trigger Property="Position" Value="Right">
+                            <Setter TargetName="PART_Header" Property="HorizontalAlignment" Value="Right" />
+                            <Setter TargetName="PART_Header" Property="VerticalAlignment" Value="Stretch" />
+                        </Trigger>
+                        <Trigger Property="Position" Value="Bottom">
+                            <Setter TargetName="PART_Header" Property="HorizontalAlignment" Value="Stretch" />
+                            <Setter TargetName="PART_Header" Property="VerticalAlignment" Value="Bottom" />
+                        </Trigger>
+                        <Trigger Property="IsOpen" Value="False">
+                            <Setter TargetName="PART_Mark" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.Drawer}" TargetType="{x:Type controls:Drawer}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 0f9c3444..73344031 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -19,10 +19,12 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawer\Drawer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loading\LoadingExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\WaterfallPanel.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\Position.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCaptureExt.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\Theme.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Theme\ThemeModel.cs" />
@@ -471,6 +473,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\Drawer.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\IPEditBox.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

From 60be04d4d5bf0c46a743db53d3ed894a8149bbd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Mon, 11 Nov 2024 22:32:48 +0800
Subject: [PATCH 121/123] update in Theme.txt

update in Theme.txt
---
 src/WPFDevelopers.Shared/Themes/Theme40.txt  | 3 ++-
 src/WPFDevelopers.Shared/Themes/Theme45x.txt | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index bf19e765..79d5f565 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -67,4 +67,5 @@ PathIcon.xaml
 NumericBox.xaml
 ColorPicker.xaml
 IPEditBox.xaml
-TimePicker.xaml
\ No newline at end of file
+TimePicker.xamlTimePicker.xaml
+Drawer.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 0679547f..fd67086b 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -68,4 +68,5 @@ PathIcon.xaml
 NumericBox.xaml
 ColorPicker.xaml
 IPEditBox.xaml
-TimePicker.xaml
\ No newline at end of file
+TimePicker.xamlTimePicker.xaml
+Drawer.xaml

From d183d488a31ca76afd7c53010c8c4583f7627c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 17 Nov 2024 21:13:58 +0800
Subject: [PATCH 122/123] update in theme

update in theme
---
 src/WPFDevelopers.Shared/Themes/Theme40.txt  | 2 +-
 src/WPFDevelopers.Shared/Themes/Theme45x.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 79d5f565..18cd3d86 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -67,5 +67,5 @@ PathIcon.xaml
 NumericBox.xaml
 ColorPicker.xaml
 IPEditBox.xaml
-TimePicker.xamlTimePicker.xaml
+TimePicker.xaml
 Drawer.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index fd67086b..9580a31e 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -68,5 +68,5 @@ PathIcon.xaml
 NumericBox.xaml
 ColorPicker.xaml
 IPEditBox.xaml
-TimePicker.xamlTimePicker.xaml
+TimePicker.xaml
 Drawer.xaml

From eeacf3a48bb008018742d338911dcd4720786c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5?= <yanjinhuamail@163.com>
Date: Sun, 17 Nov 2024 21:37:46 +0800
Subject: [PATCH 123/123] =?UTF-8?q?add=20in=20DateRangePicker=20=EF=BC=88#?=
 =?UTF-8?q?118=20=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add in DateRangePicker （#118 ）
---
 .../ExampleViews/DateRangePickerExample.xaml  |  51 ++
 .../DateRangePickerExample.xaml.cs            |  39 ++
 .../Helpers/MenuEnum.cs                       |   1 +
 .../ViewModels/MainVM.cs                      |   3 +
 .../WPFDevelopers.Samples.Shared.projitems    |   7 +
 .../WPFDevelopers.SamplesCode.csproj          |   6 +-
 .../DateRangePicker/DateRangePicker.cs        | 488 ++++++++++++++++++
 .../Core/Helpers/DatePickerHelper.cs          |  67 ++-
 .../Styles/Styles.DatePicker.xaml             |   4 +-
 .../Themes/Basic/Geometrys.xaml               |   2 +
 .../Themes/DateRangePicker.xaml               | 293 +++++++++++
 src/WPFDevelopers.Shared/Themes/Theme40.txt   |   1 +
 src/WPFDevelopers.Shared/Themes/Theme45x.txt  |   1 +
 .../WPFDevelopers.Shared.projitems            |   5 +
 14 files changed, 952 insertions(+), 16 deletions(-)
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/DateRangePicker/DateRangePicker.cs
 create mode 100644 src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml

diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
new file mode 100644
index 00000000..cef95d18
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml
@@ -0,0 +1,51 @@
+<UserControl
+    x:Class="WPFDevelopers.Samples.ExampleViews.DateRangePickerExample"
+    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>
+        <UniformGrid wd:PanelHelper.Spacing="4" Columns="2">
+            <wd:DateRangePicker
+                Width="300"
+                Height="38"
+                VerticalAlignment="Top"
+                EndWatermark="结束日期"
+                StartWatermark="开始日期" />
+            <wd:DateRangePicker
+                Width="300"
+                Height="38"
+                VerticalAlignment="Top"
+                wd:ElementHelper.CornerRadius="3"
+                EndWatermark="EndDate"
+                StartWatermark="StartDate" />
+            <WrapPanel wd:PanelHelper.Spacing="3">
+                <wd:DateRangePicker
+                    x:Name="MyDateRangePicker"
+                    Width="240"
+                    Height="38"
+                    VerticalAlignment="Top"
+                    EndDate="{Binding EndDate, RelativeSource={RelativeSource AncestorType=local:DateRangePickerExample}}"
+                    EndWatermark="结束日期"
+                    StartDate="{Binding StartDate, RelativeSource={RelativeSource AncestorType=local:DateRangePickerExample}}"
+                    StartWatermark="开始日期" />
+                <Button
+                    Width="60"
+                    HorizontalAlignment="Center"
+                    Click="Button_Click"
+                    Content="获取"
+                    Style="{StaticResource WD.PrimaryButton}" />
+            </WrapPanel>
+        </UniformGrid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DateRangePickerExample.xaml" CodeType="Xaml" />
+            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/DateRangePickerExample.xaml.cs" CodeType="CSharp" />
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml.cs
new file mode 100644
index 00000000..efaf7105
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DateRangePickerExample.xaml.cs
@@ -0,0 +1,39 @@
+using System.Windows;
+using System;
+using System.Windows.Controls;
+
+namespace WPFDevelopers.Samples.ExampleViews
+{
+    /// <summary>
+    /// DateRangePickerExample.xaml 的交互逻辑
+    /// </summary>
+    public partial class DateRangePickerExample : UserControl
+    {
+        public DateTime? StartDate
+        {
+            get { return (DateTime)GetValue(StartDateProperty); }
+            set { SetValue(StartDateProperty, value); }
+        }
+
+        public static readonly DependencyProperty StartDateProperty =
+            DependencyProperty.Register("StartDate", typeof(DateTime?), typeof(DateRangePickerExample), new PropertyMetadata(null));
+        public DateTime? EndDate
+        {
+            get { return (DateTime)GetValue(EndDateProperty); }
+            set { SetValue(EndDateProperty, value); }
+        }
+
+        public static readonly DependencyProperty EndDateProperty =
+            DependencyProperty.Register("EndDate", typeof(DateTime?), typeof(DateRangePickerExample), new PropertyMetadata(null));
+        public DateRangePickerExample()
+        {
+            InitializeComponent();
+            StartDate = DateTime.Now.AddDays(1);
+            EndDate = StartDate.Value.AddDays(10);
+        }
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            WPFDevelopers.Controls.MessageBox.Show($"开始时间：{MyDateRangePicker.StartDate} \r结束时间：{MyDateRangePicker.EndDate}", "获取日期");
+        }
+    }
+}
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index f7204688..a02b745d 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -86,6 +86,7 @@ public enum MenuEnum
         ChartPie,
         Spacing,
         Drawer,
+        DateRangePicker,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index b48269c0..01920894 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -361,6 +361,9 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Drawer:
                     ControlPanel = new DrawerExample();
                     break;
+                case MenuEnum.DateRangePicker:
+                    ControlPanel = new DateRangePickerExample();
+                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 8146f9f0..07c1fd1d 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -154,6 +154,9 @@
       <SubType>Code</SubType>
       <DependentUpon>DashboardExample.xaml</DependentUpon>
     </Compile>
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DateRangePickerExample.xaml.cs">
+      <DependentUpon>DateRangePickerExample.xaml</DependentUpon>
+    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\Desktop\DesktopBackground.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>DesktopBackground.xaml</DependentUpon>
@@ -649,6 +652,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DateRangePickerExample.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\Desktop\DesktopBackground.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index aab117c2..6abeaa6e 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFrameworks>net40;net45;net46;net47;net48;net5.0-windows;net6.0-windows;netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>net40;net45;net46;net47;net48;net5.0-windows;net6.0-windows;netcoreapp3.0</TargetFrameworks>
 		<UseWPF>true</UseWPF>
 		<AssemblyName>WPFDevelopers.SamplesCode</AssemblyName>
 		<RootNamespace>WPFDevelopers.SamplesCode</RootNamespace>
@@ -147,6 +147,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartPieExample.xaml.cs" Link="ExampleViews\ChartPieExample.xaml.cs" DependentUpon="ChartPieExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DrawerExample.xaml.cs" Link="ExampleViews\DrawerExample.xaml.cs" DependentUpon="DrawerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\\Loadings\StreamerLoading.cs" Link="Controls\Loadings\StreamerLoading.cs"/>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DateRangePickerExample.xaml.cs" Link="ExampleViews\DateRangePickerExample.xaml.cs" DependentUpon="DateRangePickerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml.cs" Link="ExampleViews\SpacingExample.xaml.cs" DependentUpon="SpacingExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\NotifyIconExample.xaml.cs" Link="ExampleViews\NotifyIconExample.xaml.cs" DependentUpon="NotifyIconExample.xaml" />
 	</ItemGroup>
@@ -502,6 +503,9 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\Controls\Loadings\StreamerLoading.xaml">
 			<Link>Controls\Loadings\StreamerLoading.xaml</Link>
 		</Resource>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\DateRangePickerExample.xaml">
+			<Link>ExampleViews\DateRangePickerExample.xaml</Link>
+		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\SpacingExample.xaml">
 			<Link>ExampleViews\SpacingExample.xaml</Link>
 		</Resource>
diff --git a/src/WPFDevelopers.Shared/Controls/DateRangePicker/DateRangePicker.cs b/src/WPFDevelopers.Shared/Controls/DateRangePicker/DateRangePicker.cs
new file mode 100644
index 00000000..199a2719
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/DateRangePicker/DateRangePicker.cs
@@ -0,0 +1,488 @@
+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 WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    [TemplatePart(Name = PopupTemplateName, Type = typeof(Popup))]
+    [TemplatePart(Name = StartCalendarTemplateName, Type = typeof(Calendar))]
+    [TemplatePart(Name = EndCalendarTemplateName, Type = typeof(Calendar))]
+    [TemplatePart(Name = TextBoxStartTemplateName, Type = typeof(DatePickerTextBox))]
+    [TemplatePart(Name = TextBoxEndTemplateName, Type = typeof(DatePickerTextBox))]
+    public class DateRangePicker : Control
+    {
+        private const string PopupTemplateName = "PART_Popup";
+        private const string StartCalendarTemplateName = "PART_StartCalendar";
+        private const string EndCalendarTemplateName = "PART_EndCalendar";
+        private const string TextBoxStartTemplateName = "PART_TextBoxStart";
+        private const string TextBoxEndTemplateName = "PART_TextBoxEnd";
+
+        public static readonly DependencyProperty StartWatermarkProperty =
+            DependencyProperty.Register("StartWatermark",
+                typeof(string),
+                typeof(DateRangePicker),
+                new PropertyMetadata(string.Empty));
+
+        public static readonly DependencyProperty EndWatermarkProperty =
+            DependencyProperty.Register("EndWatermark",
+                typeof(string),
+                typeof(DateRangePicker),
+                new PropertyMetadata(string.Empty));
+
+        public static readonly DependencyProperty StartDateProperty =
+            DependencyProperty.Register("StartDate", typeof(DateTime?), typeof(DateRangePicker),
+                new FrameworkPropertyMetadata(null,
+                    FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+                    OnStartDateChanged));
+
+        public static readonly DependencyProperty EndDateProperty =
+            DependencyProperty.Register("EndDate", typeof(DateTime?), typeof(DateRangePicker),
+                new FrameworkPropertyMetadata(null,
+                    FrameworkPropertyMetadataOptions.BindsTwoWayByDefault | FrameworkPropertyMetadataOptions.Journal,
+                    OnEndDateChanged));
+
+        public static readonly DependencyProperty DateFormatFormatProperty =
+            DependencyProperty.Register("DateFormat", typeof(string), typeof(DateRangePicker),
+                new PropertyMetadata("yyy-MM-dd"));
+
+        public static readonly DependencyProperty MaxDropDownHeightProperty =
+            DependencyProperty.Register("MaxDropDownHeight", typeof(double), typeof(DateRangePicker),
+                new UIPropertyMetadata(SystemParameters.PrimaryScreenHeight / 2.5, OnMaxDropDownHeightChanged));
+
+        private int _clickCount;
+
+        private bool _isHandlingSelectionChange;
+        private Popup _popup;
+        private Calendar _startCalendar, _endCalendar;
+        private IEnumerable<CalendarDayButton> _startCalendarDayButtons, _endCalendarDayButtons;
+        private DateTime? _startDate, _endDate;
+        private DatePickerTextBox _textBoxStart, _textBoxEnd;
+
+        static DateRangePicker()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(DateRangePicker),
+                new FrameworkPropertyMetadata(typeof(DateRangePicker)));
+        }
+
+        public string StartWatermark
+        {
+            get => (string)GetValue(StartWatermarkProperty);
+            set => SetValue(StartWatermarkProperty, value);
+        }
+
+        public string EndWatermark
+        {
+            get => (string)GetValue(EndWatermarkProperty);
+            set => SetValue(EndWatermarkProperty, value);
+        }
+
+
+        public DateTime? StartDate
+        {
+            get => (DateTime?)GetValue(StartDateProperty);
+            set => SetValue(StartDateProperty, value);
+        }
+
+        public DateTime? EndDate
+        {
+            get => (DateTime?)GetValue(EndDateProperty);
+            set => SetValue(EndDateProperty, value);
+        }
+
+        public string DateFormat
+        {
+            get => (string)GetValue(DateFormatFormatProperty);
+            set => SetValue(DateFormatFormatProperty, value);
+        }
+
+        private static void OnStartDateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        private static void OnEndDateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+
+        private static void OnMaxDropDownHeightChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var ctrl = d as DateRangePicker;
+            if (ctrl != null)
+                ctrl.OnMaxDropDownHeightChanged((double)e.OldValue, (double)e.NewValue);
+        }
+
+        protected virtual void OnMaxDropDownHeightChanged(double oldValue, double newValue)
+        {
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+            _popup = (Popup)GetTemplateChild(PopupTemplateName);
+            if (_popup != null)
+            {
+                _popup.Focusable = true;
+                _popup.PlacementTarget = this;
+                _popup.Opened -= Popup_Opened;
+                _popup.Opened += Popup_Opened;
+            }
+
+            AddHandler(PreviewMouseUpEvent, new MouseButtonEventHandler(OnPreviewMouseUp), true);
+
+            _startCalendar = (Calendar)GetTemplateChild(StartCalendarTemplateName);
+            if (_startCalendar != null)
+            {
+                _startCalendar.PreviewMouseUp += OnCalendar_PreviewMouseUp;
+                _startCalendar.DisplayDateChanged += OnStartCalendar_DisplayDateChanged;
+                _startCalendar.SelectedDatesChanged += OnStartCalendar_SelectedDatesChanged;
+            }
+
+            _endCalendar = (Calendar)GetTemplateChild(EndCalendarTemplateName);
+            if (_endCalendar != null)
+            {
+                _endCalendar.PreviewMouseUp += OnCalendar_PreviewMouseUp;
+                _endCalendar.DisplayDateChanged += OnEndCalendar_DisplayDateChanged;
+                _endCalendar.SelectedDatesChanged += OnEndCalendar_SelectedDatesChanged;
+            }
+
+            var now = DateTime.Now;
+            var firstDayOfNextMonth = new DateTime(now.Year, now.Month, 1).AddMonths(1);
+            _startCalendar.DisplayDateEnd = firstDayOfNextMonth.AddDays(-1);
+            _endCalendar.DisplayDate = firstDayOfNextMonth;
+            _endCalendar.DisplayDateStart = firstDayOfNextMonth;
+            var window = Window.GetWindow(this);
+            if (window != null)
+                window.MouseDown += OnWindow_MouseDown;
+
+            _startCalendarDayButtons = GetCalendarDayButtons(_startCalendar);
+            _endCalendarDayButtons = GetCalendarDayButtons(_endCalendar);
+            _textBoxStart = (DatePickerTextBox)GetTemplateChild(TextBoxStartTemplateName);
+            if (_textBoxStart != null)
+                _textBoxStart.TextChanged += TextBoxStart_TextChanged;
+            _textBoxEnd = (DatePickerTextBox)GetTemplateChild(TextBoxEndTemplateName);
+            if (_textBoxEnd != null)
+                _textBoxEnd.TextChanged += TextBoxEnd_TextChanged;
+            Loaded += DateRangePicker_Loaded;
+        }
+
+        private void TextBoxEnd_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBoxEnd != null)
+            {
+                if (DateTime.TryParse(_textBoxEnd.Text, out var dateTime))
+                {
+                    if (EndDate.HasValue && dateTime.ToString(DateFormat) == EndDate.Value.ToString(DateFormat))
+                        return;
+                    if (StartDate.HasValue && dateTime < StartDate.Value.Date)
+                    {
+                        EndDate = _endDate;
+                        _textBoxEnd.Text = _endDate.Value.ToString(DateFormat);
+                        return;
+                    }
+
+                    SetIsHighlightFalse(_endCalendarDayButtons);
+                    EndDate = dateTime;
+                    PopupOpened();
+                }
+                else
+                {
+                    EndDate = _endDate;
+                    _textBoxEnd.Text = _endDate.Value.ToString(DateFormat);
+                }
+            }
+        }
+
+        private void TextBoxStart_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (_textBoxStart != null)
+            {
+                if (DateTime.TryParse(_textBoxStart.Text, out var dateTime))
+                {
+                    if (StartDate.HasValue && dateTime.ToString(DateFormat) == StartDate.Value.ToString(DateFormat))
+                        return;
+                    if (EndDate.HasValue && dateTime < EndDate.Value.Date)
+                    {
+                        StartDate = _startDate;
+                        _textBoxStart.Text = _startDate.Value.ToString(DateFormat);
+                        return;
+                    }
+
+                    SetIsHighlightFalse(_startCalendarDayButtons);
+                    StartDate = dateTime;
+                    PopupOpened();
+                }
+                else
+                {
+                    StartDate = _startDate;
+                    _textBoxStart.Text = _startDate.Value.ToString(DateFormat);
+                }
+            }
+        }
+
+        private void ClearSelectedDates()
+        {
+            _startCalendar.SelectedDatesChanged -= OnStartCalendar_SelectedDatesChanged;
+            _endCalendar.SelectedDatesChanged -= OnEndCalendar_SelectedDatesChanged;
+            _startCalendar.SelectedDates.Clear();
+            SetIsHighlightFalse(_startCalendarDayButtons);
+            _endCalendar.SelectedDates.Clear();
+            SetIsHighlightFalse(_endCalendarDayButtons);
+            _startCalendar.SelectedDatesChanged += OnStartCalendar_SelectedDatesChanged;
+            _endCalendar.SelectedDatesChanged += OnEndCalendar_SelectedDatesChanged;
+        }
+
+        private void DateRangePicker_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (_textBoxStart != null && StartDate.HasValue)
+                _textBoxStart.Text = StartDate.Value.ToString(DateFormat);
+            if (_textBoxEnd != null && EndDate.HasValue)
+                _textBoxEnd.Text = EndDate.Value.ToString(DateFormat);
+        }
+
+        private void Popup_Opened(object sender, EventArgs e)
+        {
+            PopupOpened();
+        }
+
+        private void PopupOpened()
+        {
+            _startCalendar.SelectedDatesChanged -= OnStartCalendar_SelectedDatesChanged;
+            _endCalendar.SelectedDatesChanged -= OnEndCalendar_SelectedDatesChanged;
+            if (StartDate.HasValue)
+                _startDate = StartDate.Value;
+            if (EndDate.HasValue)
+                _endDate = EndDate.Value;
+            _clickCount = 0;
+            SetSelectedDates(EndDate);
+            _startCalendar.SelectedDatesChanged += OnStartCalendar_SelectedDatesChanged;
+            _endCalendar.SelectedDatesChanged += OnEndCalendar_SelectedDatesChanged;
+        }
+
+        private void OnEndCalendar_DisplayDateChanged(object sender, CalendarDateChangedEventArgs e)
+        {
+            if (!_startDate.HasValue || !_endDate.HasValue)
+                return;
+            var isYearMonthBetween = IsYearMonthBetween(e.AddedDate.Value, _startDate.Value, _endDate.Value);
+            if (!isYearMonthBetween)
+            {
+                SetIsHighlightFalse(_endCalendarDayButtons);
+            }
+            else
+            {
+                SetIsHighlightFalse(_endCalendarDayButtons);
+                SetSelectedDates();
+            }
+        }
+
+        private void OnStartCalendar_DisplayDateChanged(object sender, CalendarDateChangedEventArgs e)
+        {
+            if (!_startDate.HasValue || !_endDate.HasValue)
+                return;
+            var isYearMonthBetween = IsYearMonthBetween(e.AddedDate.Value, _startDate.Value, _endDate.Value);
+            if (!isYearMonthBetween)
+            {
+                SetIsHighlightFalse(_startCalendarDayButtons);
+            }
+            else
+            {
+                SetIsHighlightFalse(_startCalendarDayButtons);
+                SetSelectedDates();
+            }
+        }
+
+        private void OnStartCalendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_isHandlingSelectionChange)
+                return;
+            _isHandlingSelectionChange = true;
+            try
+            {
+                if (e.AddedItems.Count > 0)
+                {
+                    var dateTime = Convert.ToDateTime(e.AddedItems[0]);
+                    _endCalendar.SelectedDates.Clear();
+                    ResetDate(dateTime);
+                }
+
+                SetSelectedDates();
+            }
+            finally
+            {
+                _isHandlingSelectionChange = false;
+            }
+        }
+
+        private void OnEndCalendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (_isHandlingSelectionChange)
+                return;
+            _isHandlingSelectionChange = true;
+            try
+            {
+                if (e.AddedItems.Count > 0)
+                {
+                    var dateTime = Convert.ToDateTime(e.AddedItems[0]);
+                    _startCalendar.SelectedDates.Clear();
+                    ResetDate(dateTime);
+                }
+
+                SetSelectedDates();
+            }
+            finally
+            {
+                _isHandlingSelectionChange = false;
+            }
+        }
+
+        private void OnCalendar_PreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (Mouse.Captured is CalendarItem)
+            {
+                _clickCount++;
+                Mouse.Capture(null);
+            }
+        }
+
+        private void OnWindow_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (_popup != null && _popup.IsOpen)
+                _popup.IsOpen = false;
+        }
+
+        private void OnPreviewMouseUp(object sender, MouseButtonEventArgs e)
+        {
+            if (_popup != null && !_popup.IsOpen)
+                _popup.IsOpen = true;
+        }
+
+        private void ResetDate(DateTime? dateTime)
+        {
+            if (_startDate.HasValue && _endDate.HasValue)
+            {
+                _startDate = Convert.ToDateTime(dateTime);
+                _endDate = null;
+                if (_startCalendarDayButtons != null)
+                {
+                    var startDays = _startCalendarDayButtons.Where(x => DatePickerHelper.GetIsHighlight(x));
+                    foreach (var day in startDays) DatePickerHelper.SetIsHighlight(day, false);
+                }
+
+                if (_endCalendarDayButtons != null)
+                {
+                    var endDays = _endCalendarDayButtons.Where(x => DatePickerHelper.GetIsHighlight(x));
+                    foreach (var day in endDays) DatePickerHelper.SetIsHighlight(day, false);
+                }
+            }
+            else
+            {
+                if (!_startDate.HasValue)
+                    _startDate = Convert.ToDateTime(dateTime);
+                else
+                    _endDate = Convert.ToDateTime(dateTime);
+            }
+        }
+
+        private void SetSelectedDates(DateTime? endDate = null)
+        {
+            if (_startDate.HasValue && _endDate.HasValue)
+            {
+                if (DateTime.Compare(_startDate.Value, _endDate.Value) > 0)
+                {
+                    var temp = _startDate.Value;
+                    _startDate = _endDate.Value;
+                    _endDate = temp;
+                }
+
+                _startCalendar.SelectedDates.Clear();
+                _endCalendar.SelectedDates.Clear();
+                var eDate = _endDate;
+                if (endDate.HasValue)
+                    eDate = endDate.Value;
+                for (var date = _startDate.Value; date < eDate.Value.AddDays(1); date = date.AddDays(1))
+                {
+                    if (date.Date <= eDate.Value.Date
+                        &&
+                        !_startCalendar.SelectedDates.Contains(date.Date)
+                        &&
+                        date.Date <= _startCalendar.DisplayDateEnd.Value.Date)
+                    {
+                        _startCalendar.SelectedDates.Add(date);
+                        if (date.Date == _startDate.Value.Date || date.Date >= eDate.Value.Date)
+                            continue;
+                        if (_startCalendarDayButtons != null)
+                        {
+                            var day = _startCalendarDayButtons.FirstOrDefault(x =>
+                                x.DataContext is DateTime buttonDate && buttonDate.Date == date.Date);
+                            if (day != null)
+                                DatePickerHelper.SetIsHighlight(day, true);
+                        }
+                    }
+
+                    if (date.Date >= _endCalendar.DisplayDateStart.Value.Date &&
+                        !_endCalendar.SelectedDates.Contains(date.Date))
+                        if (date.Date >= _startDate.Value.Date
+                            &&
+                            !_endCalendar.SelectedDates.Contains(date)
+                            &&
+                            date.Date >= _endCalendar.DisplayDateStart.Value.Date)
+                        {
+                            _endCalendar.SelectedDates.Add(date);
+                            if (date.Date == eDate.Value.Date || date.Date <= _startDate.Value.Date)
+                                continue;
+                            if (_endCalendarDayButtons != null)
+                            {
+                                var day = _endCalendarDayButtons.FirstOrDefault(x =>
+                                    x.DataContext is DateTime buttonDate && buttonDate.Date == date.Date);
+                                if (day != null)
+                                    DatePickerHelper.SetIsHighlight(day, true);
+                            }
+                        }
+                }
+
+                if (_clickCount == 2)
+                {
+                    _popup.IsOpen = false;
+                    StartDate = _startDate;
+                    EndDate = _endDate;
+                    _textBoxStart.Text = _startDate.Value.ToString(DateFormat);
+                    _textBoxEnd.Text = _endDate.Value.ToString(DateFormat);
+                }
+            }
+        }
+
+        private void SetIsHighlightFalse(IEnumerable<CalendarDayButton> calendarDayButtons)
+        {
+            if (calendarDayButtons == null)
+                return;
+            var days = calendarDayButtons.Where(x => DatePickerHelper.GetIsHighlight(x));
+            foreach (var day in days)
+                DatePickerHelper.SetIsHighlight(day, false);
+        }
+
+        private bool IsYearMonthBetween(DateTime dateToCheck, DateTime startDate, DateTime endDate)
+        {
+            return dateToCheck.Year == startDate.Year && dateToCheck.Month >= startDate.Month &&
+                   dateToCheck.Year == endDate.Year && dateToCheck.Month <= endDate.Month;
+        }
+
+        private IEnumerable<CalendarDayButton> GetCalendarDayButtons(DependencyObject parent)
+        {
+            if (parent == null) yield break;
+
+            for (var i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
+            {
+                var child = VisualTreeHelper.GetChild(parent, i);
+                if (child is CalendarDayButton dayButton)
+                    yield return dayButton;
+                foreach (var result in GetCalendarDayButtons(child))
+                    yield return result;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/DatePickerHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/DatePickerHelper.cs
index 27a5f497..4a06328c 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/DatePickerHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/DatePickerHelper.cs
@@ -25,6 +25,10 @@ public class DatePickerHelper
        DependencyProperty.RegisterAttached("IsMonthYear", typeof(bool), typeof(DatePickerHelper),
                                            new PropertyMetadata(OnIsMonthYearChanged));
 
+        public static readonly DependencyProperty IsHighlightProperty =
+            DependencyProperty.RegisterAttached("IsHighlight", typeof(bool), typeof(DatePickerHelper), 
+                new PropertyMetadata(false));
+
         public static object GetWatermark(DependencyObject obj)
         {
             return obj.GetValue(WatermarkProperty);
@@ -53,24 +57,62 @@ public static void SetIsMonthYear(DependencyObject dobj, bool value)
         {
             dobj.SetValue(IsMonthYearProperty, value);
         }
+
+        public static bool GetIsHighlight(DependencyObject obj)
+        {
+            return (bool)obj.GetValue(IsHighlightProperty);
+        }
+
+        public static void SetIsHighlight(DependencyObject obj, bool value)
+        {
+            obj.SetValue(IsHighlightProperty, value);
+        }
+
         private static void OnWatermarkChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
-            var datePicker = (DatePicker) d;
-            if (datePicker == null)
-                return;
-            if (datePicker.IsLoaded)
+            if (d is DatePicker datePicker)
             {
-                SetWatermarkInternal(datePicker, e.NewValue);
+                if (datePicker.IsLoaded)
+                {
+                    SetWatermarkInternal(datePicker, e.NewValue);
+                }
+                else
+                {
+                    RoutedEventHandler loadedHandler = null;
+                    loadedHandler = delegate
+                    {
+                        datePicker.Loaded -= loadedHandler;
+                        SetWatermarkInternal(datePicker, e.NewValue);
+                    };
+                    datePicker.Loaded += loadedHandler;
+                }
             }
-            else
+            else if (d is DatePickerTextBox datePickerTextBox)
             {
-                RoutedEventHandler loadedHandler = null;
-                loadedHandler = delegate
+                if (datePickerTextBox.IsLoaded)
                 {
-                    datePicker.Loaded -= loadedHandler;
-                    SetWatermarkInternal(datePicker, e.NewValue);
-                };
-                datePicker.Loaded += loadedHandler;
+                    SetDatePickerTextBoxWatermark(datePickerTextBox, e.NewValue);
+                }
+                else
+                {
+                    RoutedEventHandler loadedHandler = null;
+                    loadedHandler = delegate
+                    {
+                        datePickerTextBox.Loaded -= loadedHandler;
+                        SetDatePickerTextBoxWatermark(datePickerTextBox, e.NewValue);
+                    };
+                    datePickerTextBox.Loaded += loadedHandler;
+                }
+            }
+        }
+
+        private static void SetDatePickerTextBoxWatermark(DatePickerTextBox d, object value)
+        {
+            if (d != null)
+            {
+                var watermarkControl = d.Template.FindName("PART_Watermark", d) as ContentControl;
+                if (watermarkControl != null)
+                    watermarkControl.Content = value;
             }
         }
 
@@ -85,7 +127,6 @@ private static void SetWatermarkInternal(DatePicker d, object value)
             }
         }
 
-
         private static void TextTrimmingPropertyChanged(
             DependencyObject obj, DependencyPropertyChangedEventArgs e)
         {
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
index 75350143..76d48fc3 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
@@ -117,7 +117,7 @@
                         <Trigger Property="IsBlackedOut" Value="True">
                             <Setter TargetName="Blackout" Property="Visibility" Value="Visible" />
                         </Trigger>
-                        <!--<Trigger Property="helpers:DatePickerHelper.IsHighlight" Value="True">
+                        <Trigger Property="helpers:DatePickerHelper.IsHighlight" Value="True">
                             <Setter TargetName="SelectedBackground" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="SelectionBackground" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.RegularTextSolidColorBrush}" />
@@ -131,7 +131,7 @@
                             <Setter TargetName="NormalText" Property="TextElement.Foreground" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                             <Setter TargetName="SelectedBackground" Property="Opacity" Value="0" />
                             <Setter TargetName="SelectionBackground" Property="Opacity" Value=".3" />
-                        </MultiTrigger>-->
+                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
index 3b94e702..97501963 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Geometrys.xaml
@@ -100,4 +100,6 @@
     <Geometry x:Key="WD.UnfoldMoreGeometry" po:Freeze="True">M512 776l136-136 60 60-196 196-196-196 60-60zM512 248l-136 136-60-60 196-196 196 196-60 60z</Geometry>
 
     <Geometry x:Key="WD.TimeGeometry" po:Freeze="True">M512 112c-229.792 0-416 186.24-416 416s186.208 416 416 416c229.728 0 416-186.24 416-416s-186.24-416-416-416zM508.64 864.864c-185.568 0-336-150.432-336-336s150.432-336 336-336c185.536 0 336 150.432 336 336 0 185.568-150.464 336-336 336zM605.76 548.192h-95.36v-161.024c0-17.472-14.176-31.68-31.648-31.68-17.504 0-31.68 14.176-31.68 31.68v192.672c0 17.504 14.176 31.648 31.68 31.648h127.008c17.504 0 31.68-14.144 31.68-31.648 0-17.472-14.176-31.648-31.68-31.648z</Geometry>
+    <Geometry x:Key="WD.DateRangeRightGeometry" po:Freeze="True">M873.1 596.2l-164-208A32 32 0 00684 376h-64.8c-6.7 0-10.4 7.7-6.3 13l144.3 183H152c-4.4 0-8 3.6-8 8v60c0 4.4 3.6 8 8 8h695.9c26.8 0 41.7-30.8 25.2-51.8z</Geometry>
+    <Geometry x:Key="WD.DateGeometry" po:Freeze="True">M13 2h-1v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H6v1.5c0 .28-.22.5-.5.5h-2c-.28 0-.5-.22-.5-.5V2H2c-.55 0-1 .45-1 1v11c0 .55.45 1 1 1h11c.55 0 1-.45 1-1V3c0-.55-.45-1-1-1zm0 12H2V5h11v9zM5 3H4V1h1v2zm6 0h-1V1h1v2zM6 7H5V6h1v1zm2 0H7V6h1v1zm2 0H9V6h1v1zm2 0h-1V6h1v1zM4 9H3V8h1v1zm2 0H5V8h1v1zm2 0H7V8h1v1zm2 0H9V8h1v1zm2 0h-1V8h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1zm2 0h-1v-1h1v1zm-8 2H3v-1h1v1zm2 0H5v-1h1v1zm2 0H7v-1h1v1zm2 0H9v-1h1v1z</Geometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
new file mode 100644
index 00000000..0070cf1b
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/DateRangePicker.xaml
@@ -0,0 +1,293 @@
+<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">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <Style
+        x:Key="WD.NoShadowCalendarItemStyle"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type CalendarItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type CalendarItem}">
+                    <ControlTemplate.Resources>
+                        <DataTemplate x:Key="{x:Static CalendarItem.DayTitleTemplateResourceKey}">
+                            <StackPanel>
+                                <TextBlock
+                                    Margin="0,6"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    FontSize="12"
+                                    Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}"
+                                    Text="{Binding}" />
+                                <Rectangle
+                                    Height="1"
+                                    VerticalAlignment="Bottom"
+                                    Fill="{DynamicResource WD.BaseSolidColorBrush}" />
+                            </StackPanel>
+                        </DataTemplate>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel x:Name="PART_Root" Margin="{TemplateBinding Margin}">
+                        <Border
+                            Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                            BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                            BorderThickness="{Binding BorderThickness, RelativeSource={RelativeSource AncestorType=Calendar}}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}"
+                            SnapsToDevicePixels="True"
+                            UseLayoutRounding="True">
+                            <Grid Margin="0,20,0,0">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+                                <Button
+                                    x:Name="PART_PreviousButton"
+                                    Grid.Row="0"
+                                    Grid.Column="0"
+                                    Width="28"
+                                    Height="20"
+                                    HorizontalAlignment="Left"
+                                    Focusable="False"
+                                    Template="{StaticResource WD.PreviousButtonTemplate}" />
+                                <Button
+                                    x:Name="PART_HeaderButton"
+                                    Grid.Row="0"
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Focusable="False"
+                                    FontSize="14"
+                                    Template="{StaticResource WD.HeaderButtonTemplate}" />
+                                <Button
+                                    x:Name="PART_NextButton"
+                                    Grid.Row="0"
+                                    Grid.Column="2"
+                                    Width="28"
+                                    Height="20"
+                                    HorizontalAlignment="Right"
+                                    Focusable="False"
+                                    Template="{StaticResource WD.NextButtonTemplate}" />
+                                <Grid
+                                    x:Name="PART_MonthView"
+                                    Grid.Row="1"
+                                    Grid.ColumnSpan="3"
+                                    Margin="6,10"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Visibility="Visible">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                </Grid>
+                                <Grid
+                                    x:Name="PART_YearView"
+                                    Grid.Row="1"
+                                    Grid.ColumnSpan="3"
+                                    Margin="6,-3,7,6"
+                                    HorizontalAlignment="Center"
+                                    VerticalAlignment="Center"
+                                    Visibility="Hidden">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Year">
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding DisplayMode, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Calendar}}}" Value="Decade">
+                            <Setter TargetName="PART_MonthView" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="PART_YearView" Property="Visibility" Value="Visible" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="WD.DateRangePicker" TargetType="{x:Type controls:DateRangePicker}">
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
+        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type controls:DateRangePicker}">
+                    <ControlTemplate.Resources>
+                        <Storyboard x:Key="OpenStoryboard">
+                            <DoubleAnimation
+                                EasingFunction="{StaticResource WD.ExponentialEaseOut}"
+                                Storyboard.TargetName="PART_DropDown"
+                                Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="1"
+                                Duration="00:00:.2" />
+                        </Storyboard>
+                        <Storyboard x:Key="CloseStoryboard">
+                            <DoubleAnimation
+                                EasingFunction="{StaticResource WD.ExponentialEaseOut}"
+                                Storyboard.TargetName="PART_DropDown"
+                                Storyboard.TargetProperty="(Grid.RenderTransform).(ScaleTransform.ScaleY)"
+                                To="0"
+                                Duration="00:00:.2" />
+                        </Storyboard>
+                    </ControlTemplate.Resources>
+                    <controls:SmallPanel SnapsToDevicePixels="True">
+                        <Border
+                            Name="PART_Border"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                            SnapsToDevicePixels="True" />
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <controls:PathIcon
+                                Margin="15,0,0,0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Kind="Date" />
+                            <DatePickerTextBox
+                                x:Name="PART_TextBoxStart"
+                                Grid.Column="1"
+                                Width="Auto"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                helpers:DatePickerHelper.Watermark="{Binding StartWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                Background="Transparent"
+                                Focusable="True"
+                                Foreground="{TemplateBinding Foreground}"
+                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+                            <controls:PathIcon
+                                Grid.Column="2"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Kind="DateRangeRight" />
+                            <DatePickerTextBox
+                                x:Name="PART_TextBoxEnd"
+                                Grid.Column="3"
+                                Width="Auto"
+                                Margin="10,0,0,0"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                helpers:DatePickerHelper.Watermark="{Binding EndWatermark, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                Background="Transparent"
+                                Focusable="True"
+                                Foreground="{TemplateBinding Foreground}"
+                                SelectionBrush="{DynamicResource WD.WindowBorderBrushSolidColorBrush}" />
+                        </Grid>
+                        <Popup
+                            x:Name="PART_Popup"
+                            MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                            AllowsTransparency="True"
+                            Focusable="False"
+                            Placement="Bottom"
+                            StaysOpen="False"
+                            VerticalOffset="2">
+                            <controls:SmallPanel
+                                x:Name="PART_DropDown"
+                                MinWidth="{TemplateBinding FrameworkElement.ActualWidth}"
+                                MaxHeight="{TemplateBinding MaxDropDownHeight}"
+                                Margin="24,2,24,24"
+                                RenderTransformOrigin=".5,0"
+                                SnapsToDevicePixels="True">
+                                <controls:SmallPanel.RenderTransform>
+                                    <ScaleTransform ScaleY="0" />
+                                </controls:SmallPanel.RenderTransform>
+                                <Border
+                                    Name="PART_DropDownBorder"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
+                                    Effect="{StaticResource WD.PopupShadowDepth}"
+                                    SnapsToDevicePixels="True"
+                                    UseLayoutRounding="True" />
+                                <StackPanel Orientation="Horizontal">
+                                    <Calendar
+                                        x:Name="PART_StartCalendar"
+                                        Margin="2,0,0,0"
+                                        BorderThickness="0"
+                                        CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
+                                        SelectionMode="MultipleRange" />
+                                    <Calendar
+                                        x:Name="PART_EndCalendar"
+                                        Margin="0,0,2,0"
+                                        BorderThickness="0"
+                                        CalendarItemStyle="{StaticResource WD.NoShadowCalendarItemStyle}"
+                                        SelectionMode="MultipleRange" />
+                                </StackPanel>
+                            </controls:SmallPanel>
+                        </Popup>
+                    </controls:SmallPanel>
+                    <ControlTemplate.Triggers>
+                        <Trigger SourceName="PART_Popup" Property="IsOpen" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardOpenStoryboard" Storyboard="{StaticResource OpenStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardOpenStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger SourceName="PART_Popup" Property="IsOpen" Value="False">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard x:Name="BeginStoryboardCloseStoryboard" Storyboard="{StaticResource CloseStoryboard}" />
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <StopStoryboard BeginStoryboardName="BeginStoryboardCloseStoryboard" />
+                            </Trigger.ExitActions>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <Style BasedOn="{StaticResource WD.DateRangePicker}" TargetType="{x:Type controls:DateRangePicker}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index 18cd3d86..d7623a8b 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -69,3 +69,4 @@ ColorPicker.xaml
 IPEditBox.xaml
 TimePicker.xaml
 Drawer.xaml
+DateRangePicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 9580a31e..09b32b82 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -70,3 +70,4 @@ ColorPicker.xaml
 IPEditBox.xaml
 TimePicker.xaml
 Drawer.xaml
+DateRangePicker.xaml
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 73344031..ac1fe254 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -19,6 +19,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\DateRangePicker\DateRangePicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawer\Drawer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\IPEditBox\IPEditBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Loadings\LoadingBase.cs" />
@@ -473,6 +474,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\DateRangePicker.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Drawer.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>